Skip to content

Commit

Permalink
MID-3272: Fixed object filter simplifier to reliably remove all embed…
Browse files Browse the repository at this point in the history 
…ded ALL/NONE/UNDEFINED filters.
  • Loading branch information
@mederly
mederly committed Jul 4, 2016
1 parent 0bdb40f commit dea9249
Show file tree
Hide file tree
Showing 9 changed files with 622 additions and 101 deletions.
12 changes: 10 additions & 2 deletions infra/prism/src/main/java/com/evolveum/midpoint/prism/query/ExistsFilter.java
View file
Expand Up @@ -61,7 +61,11 @@ public ObjectFilter getFilter() {
return filter;
}

public static <C extends Containerable> ExistsFilter createExists(ItemPath itemPath, PrismContainerDefinition<C> containerDef,
public void setFilter(ObjectFilter filter) {
this.filter = filter;
}

public static <C extends Containerable> ExistsFilter createExists(ItemPath itemPath, PrismContainerDefinition<C> containerDef,
ObjectFilter filter) throws SchemaException {
ItemDefinition itemDefinition = FilterUtils.findItemDefinition(itemPath, containerDef);
return new ExistsFilter(itemPath, itemDefinition, filter);
Expand All @@ -79,7 +83,11 @@ public ObjectFilter clone() {
return new ExistsFilter(fullPath, definition, f);
}

@Override
public ExistsFilter cloneEmpty() {
return new ExistsFilter(fullPath, definition, null);
}

@Override
public boolean match(PrismContainerValue value, MatchingRuleRegistry matchingRuleRegistry) throws SchemaException {
throw new UnsupportedOperationException();
}
Expand Down
6 changes: 5 additions & 1 deletion infra/prism/src/main/java/com/evolveum/midpoint/prism/query/TypeFilter.java
View file
Expand Up @@ -64,7 +64,11 @@ public ObjectFilter clone() {
return new TypeFilter(type, f);
}

// untested; TODO test this method
public TypeFilter cloneEmpty() {
return new TypeFilter(type, null);
}

// untested; TODO test this method
@Override
public boolean match(PrismContainerValue value, MatchingRuleRegistry matchingRuleRegistry) throws SchemaException {
if (value == null) {
Expand Down
81 changes: 46 additions & 35 deletions infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ObjectQueryUtil.java
View file
Expand Up @@ -21,6 +21,8 @@
import javax.xml.namespace.QName;

import com.evolveum.midpoint.prism.*;
import com.evolveum.midpoint.prism.query.*;
import com.evolveum.midpoint.prism.query.Visitor;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.Validate;
import org.apache.commons.lang.mutable.MutableBoolean;
Expand All @@ -31,21 +33,6 @@
import com.evolveum.midpoint.prism.polystring.PolyString;
import com.evolveum.midpoint.prism.polystring.PolyStringNormalizer;
import com.evolveum.midpoint.prism.polystring.PrismDefaultPolyStringNormalizer;
import com.evolveum.midpoint.prism.query.AllFilter;
import com.evolveum.midpoint.prism.query.AndFilter;
import com.evolveum.midpoint.prism.query.EqualFilter;
import com.evolveum.midpoint.prism.query.NaryLogicalFilter;
import com.evolveum.midpoint.prism.query.NoneFilter;
import com.evolveum.midpoint.prism.query.NotFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.prism.query.OrFilter;
import com.evolveum.midpoint.prism.query.OrgFilter;
import com.evolveum.midpoint.prism.query.RefFilter;
import com.evolveum.midpoint.prism.query.TypeFilter;
import com.evolveum.midpoint.prism.query.UndefinedFilter;
import com.evolveum.midpoint.prism.query.ValueFilter;
import com.evolveum.midpoint.prism.query.Visitor;
import com.evolveum.midpoint.schema.ResourceShadowDiscriminator;
import com.evolveum.midpoint.util.DOMUtil;
import com.evolveum.midpoint.util.exception.SchemaException;
Expand Down Expand Up @@ -317,9 +304,11 @@ public static boolean isAll(ObjectFilter filter) {
}

public static boolean isNone(ObjectFilter filter) {
return filter != null && filter instanceof NoneFilter;
return filter instanceof NoneFilter;
}

// returns ALL, NONE only at the top level (never inside the filter)
// never returns UNDEFINED
public static ObjectFilter simplify(ObjectFilter filter) {
if (filter == null) {
return null;
Expand All @@ -335,19 +324,23 @@ public static ObjectFilter simplify(ObjectFilter filter) {
// AND with "true", just skip it
} else {
ObjectFilter simplifiedSubfilter = simplify(subfilter);
simplifiedFilter.addCondition(simplifiedSubfilter);
if (simplifiedSubfilter instanceof NoneFilter) {
return NoneFilter.createNone();
} else if (simplifiedSubfilter == null || simplifiedSubfilter instanceof AllFilter) {
// skip
} else {
simplifiedFilter.addCondition(simplifiedSubfilter);
}
}
}
if (simplifiedFilter.isEmpty()) {
return AllFilter.createAll();
}

if (simplifiedFilter.getConditions().size() == 1){
} else if (simplifiedFilter.getConditions().size() == 1) {
return simplifiedFilter.getConditions().iterator().next();
} else {
return simplifiedFilter;
}

return simplifiedFilter;

} else if (filter instanceof OrFilter) {
List<ObjectFilter> conditions = ((OrFilter)filter).getConditions();
OrFilter simplifiedFilter = ((OrFilter)filter).cloneEmpty();
Expand All @@ -359,27 +352,29 @@ public static ObjectFilter simplify(ObjectFilter filter) {
return AllFilter.createAll();
} else {
ObjectFilter simplifiedSubfilter = simplify(subfilter);
simplifiedFilter.addCondition(simplifiedSubfilter);
if (simplifiedSubfilter instanceof NoneFilter) {
// skip
} else if (simplifiedSubfilter == null || simplifiedSubfilter instanceof AllFilter) {
return NoneFilter.createNone();
} else {
simplifiedFilter.addCondition(simplifiedSubfilter);
}
}
}
if (simplifiedFilter.isEmpty()) {
return AllFilter.createAll();
}

if (simplifiedFilter.getConditions().size() == 1){
return NoneFilter.createNone();
} else if (simplifiedFilter.getConditions().size() == 1) {
return simplifiedFilter.getConditions().iterator().next();
} else {
return simplifiedFilter;
}

return simplifiedFilter;


} else if (filter instanceof NotFilter) {
ObjectFilter subfilter = ((NotFilter)filter).getFilter();
ObjectFilter simplifiedSubfilter = simplify(subfilter);
if (subfilter instanceof UndefinedFilter){
return null;
} else if (subfilter instanceof NoneFilter) {
if (simplifiedSubfilter instanceof NoneFilter) {
return AllFilter.createAll();
} else if (subfilter instanceof AllFilter) {
} else if (simplifiedSubfilter == null || simplifiedSubfilter instanceof AllFilter) {
return NoneFilter.createNone();
} else {
NotFilter simplifiedFilter = ((NotFilter)filter).cloneEmpty();
Expand All @@ -389,7 +384,23 @@ public static ObjectFilter simplify(ObjectFilter filter) {
} else if (filter instanceof TypeFilter) {
ObjectFilter subFilter = ((TypeFilter) filter).getFilter();
ObjectFilter simplifiedSubfilter = simplify(subFilter);
TypeFilter simplifiedFilter = (TypeFilter) ((TypeFilter) filter).clone();
if (simplifiedSubfilter instanceof AllFilter) {
simplifiedSubfilter = null;
} else if (simplifiedSubfilter instanceof NoneFilter) {
return NoneFilter.createNone();
}
TypeFilter simplifiedFilter = ((TypeFilter) filter).cloneEmpty();
simplifiedFilter.setFilter(simplifiedSubfilter);
return simplifiedFilter;
} else if (filter instanceof ExistsFilter) {
ObjectFilter subFilter = ((ExistsFilter) filter).getFilter();
ObjectFilter simplifiedSubfilter = simplify(subFilter);
if (simplifiedSubfilter instanceof AllFilter) {
simplifiedSubfilter = null;
} else if (simplifiedSubfilter instanceof NoneFilter) {
return NoneFilter.createNone();
}
ExistsFilter simplifiedFilter = ((ExistsFilter) filter).cloneEmpty();
simplifiedFilter.setFilter(simplifiedSubfilter);
return simplifiedFilter;
} else if (filter instanceof UndefinedFilter || filter instanceof AllFilter) {
Expand Down

0 comments on commit dea9249

Please sign in to comment.