Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] Refactored ReportFilterPolicy for easier extension

This commit is contained in:
Robert von Burg 2018-06-26 18:30:29 +02:00
parent 20632279f9
commit c052911d71
4 changed files with 71 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
li.strolch.service/src/main/java/li/strolch/report/policy/EqualsReportFilter.java
View File

@ -1,40 +1,20 @@
package li.strolch.report.policy;
import li.strolch.agent.api.ComponentContainer;
import li.strolch.model.parameter.Parameter;
import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.utils.ObjectHelper;
public class EqualsReportFilter extends ReportFilterPolicy {
private boolean negate;
private String value;
public EqualsReportFilter(ComponentContainer container, StrolchTransaction tx) {
super(container, tx);
}
@Override
public void init(String value) {
if (value.startsWith("!")) {
this.negate = true;
this.value = value.substring(1);
} else {
this.value = value;
}
}
@Override
public boolean filter(Parameter<?> parameter) {
String value = parameter.getValueAsString();
return filter(value);
}
@Override
public boolean filter(String value) {
if (this.negate)
return !this.value.equals(value);
protected boolean filter(Object left, Object right, boolean negate) {
if (negate)
return !ObjectHelper.equals(left, right, false);
else
return this.value.equals(value);
return ObjectHelper.equals(left, right, false);
}
}

11
li.strolch.service/src/main/java/li/strolch/report/policy/GenericReport.java
View File

@ -267,16 +267,7 @@ public class GenericReport extends ReportPolicy {
if (fieldRefP.getValue().startsWith("$")) {
Object value = evaluateColumnValue(fieldRefP, row);
String columnValue;
if (value instanceof Date)
columnValue = ISO8601FormatFactory.getInstance().formatDate((Date) value);
else if (value instanceof Parameter)
columnValue = ((Parameter) value).getValueAsString();
else
columnValue = value.toString();
if (!filterPolicy.filter(columnValue))
if (!filterPolicy.filter(value))
return false;
} else {
Optional<Parameter<?>> param = lookupParameter(fieldRefP, column);

31
li.strolch.service/src/main/java/li/strolch/report/policy/GreaterThanReportFilter.java
View File

@ -1,41 +1,20 @@
package li.strolch.report.policy;
import li.strolch.agent.api.ComponentContainer;
import li.strolch.model.parameter.FloatParameter;
import li.strolch.model.parameter.Parameter;
import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.utils.ObjectHelper;
public class GreaterThanReportFilter extends ReportFilterPolicy {
private boolean negate;
private double value;
public GreaterThanReportFilter(ComponentContainer container, StrolchTransaction tx) {
super(container, tx);
}
@Override
public void init(String value) {
if (value.startsWith("!")) {
this.negate = true;
this.value = Double.parseDouble(value.substring(1));
} else {
this.value = Double.parseDouble(value);
}
}
@Override
public boolean filter(Parameter<?> parameter) {
FloatParameter floatP = (FloatParameter) parameter;
if (this.negate)
return floatP.getValue().doubleValue() <= this.value;
protected boolean filter(Object left, Object right, boolean negate) {
if (negate)
return ObjectHelper.compare(left, right, false) > 0;
else
return floatP.getValue().doubleValue() > this.value;
}
@Override
public boolean filter(String value) {
throw new UnsupportedOperationException("Greater Than not supported on string!");
return ObjectHelper.compare(right, left, false) > 0;
}
}

63
li.strolch.service/src/main/java/li/strolch/report/policy/ReportFilterPolicy.java
View File

@ -1,9 +1,12 @@
package li.strolch.report.policy;
import java.util.Date;
import li.strolch.agent.api.ComponentContainer;
import li.strolch.model.parameter.Parameter;
import li.strolch.persistence.api.StrolchTransaction;
import li.strolch.policy.StrolchPolicy;
import li.strolch.utils.iso8601.ISO8601FormatFactory;
public abstract class ReportFilterPolicy extends StrolchPolicy {
@ -11,11 +14,65 @@ public abstract class ReportFilterPolicy extends StrolchPolicy {
super(container, tx);
}
public abstract void init(String value);
private boolean negate;
private String filterValue;
private Object left;
public abstract boolean filter(String value);
public boolean isNegate() {
return this.negate;
}
public abstract boolean filter(Parameter<?> param);
public void setNegate(boolean negate) {
this.negate = negate;
}
public void setFilterValue(String filterValue) {
this.filterValue = filterValue;
}
public Object getLeft() {
return this.left;
}
public void setLeft(Object left) {
this.left = left;
}
public void init(String value) {
if (value.startsWith("!")) {
setNegate(true);
setFilterValue(value.substring(1));
} else {
setFilterValue(value);
}
}
public boolean filter(Object value) {
Object right;
if (value instanceof Date) {
if (this.left == null)
this.left = ISO8601FormatFactory.getInstance().parseDate(this.filterValue);
right = value;
} else if (value instanceof Parameter) {
Parameter parameter = (Parameter) value;
if (this.left == null)
this.left = parameter.getValueType().parseValue(this.filterValue);
right = parameter.getValue();
} else {
if (this.left == null)
this.left = this.filterValue;
right = value.toString();
}
return filter(this.left, right, this.negate);
}
protected abstract boolean filter(Object left, Object right, boolean negate);
@Override
public void undo() {