Skip to content

Commit

Permalink
EqualsFilter -> EqualFilter (MID-1879)
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed May 19, 2014
1 parent f6bdf07 commit 89675e2
Show file tree
Hide file tree
Showing 64 changed files with 247 additions and 247 deletions.
4 changes: 2 additions & 2 deletions ...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java
View file
Expand Up @@ -279,7 +279,7 @@ protected Integer load() {
Task task = createSimpleTask(OPERATION_GET_TOTALS);
OperationResult result = new OperationResult(OPERATION_GET_TOTALS);
try {
EqualsFilter situationFilter = EqualsFilter.createEqual(ShadowType.F_SYNCHRONIZATION_SITUATION, ShadowType.class,
EqualFilter situationFilter = EqualFilter.createEqual(ShadowType.F_SYNCHRONIZATION_SITUATION, ShadowType.class,
getPrismContext(), null, situation);

AndFilter andFilter = AndFilter.createAnd(resourceFilter, situationFilter);
Expand Down Expand Up @@ -415,7 +415,7 @@ private ObjectFilter createResourceQueryFilter() {
return null;
}

EqualsFilter objectClass = EqualsFilter.createEqual(ShadowType.F_OBJECT_CLASS, ShadowType.class, getPrismContext(),
EqualFilter objectClass = EqualFilter.createEqual(ShadowType.F_OBJECT_CLASS, ShadowType.class, getPrismContext(),
null, qname);

return AndFilter.createAnd(resourceRef, objectClass);
Expand Down
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
View file
Expand Up @@ -301,7 +301,7 @@ private ObjectQuery createQuery(){
getPrismContext(), PolyStringNormMatchingRule.NAME, normalizedText);

if(parent == true){
EqualsFilter boolFilter = EqualsFilter.createEqual(ReportType.F_PARENT, ReportType.class,
EqualFilter boolFilter = EqualFilter.createEqual(ReportType.F_PARENT, ReportType.class,
getPrismContext(), null, parent);

query.setFilter(AndFilter.createAnd(substring, boolFilter));
Expand All @@ -310,7 +310,7 @@ private ObjectQuery createQuery(){
}
} else{
if(parent == true){
EqualsFilter boolFilter = EqualsFilter.createEqual(ReportType.F_PARENT, ReportType.class,
EqualFilter boolFilter = EqualFilter.createEqual(ReportType.F_PARENT, ReportType.class,
getPrismContext(), null, parent);

query.setFilter(boolFilter);
Expand Down
2 changes: 1 addition & 1 deletion ...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageAdminResources.java
View file
Expand Up @@ -123,7 +123,7 @@ protected void deleteSyncTokenPerformed(AjaxRequestTarget target, IModel<Resourc
ObjectFilter refFilter = RefFilter.createReferenceEqual(TaskType.F_OBJECT_REF, TaskType.class,
getPrismContext(), resourceOid);

ObjectFilter filterHandleUri = EqualsFilter.createEqual(TaskType.F_HANDLER_URI, TaskType.class,
ObjectFilter filterHandleUri = EqualFilter.createEqual(TaskType.F_HANDLER_URI, TaskType.class,
getPrismContext(), null, handlerUri);

query = new ObjectQuery();
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/evolveum/midpoint/web/page/admin/resources/content/PageContentAccounts.java
View file
Expand Up @@ -538,7 +538,7 @@ private ObjectQuery createQuery() {

//TODO set matching rule instead fo null
for (ResourceAttributeDefinition attrDef : identifiers) {
conditions.add(EqualsFilter.createEqual(new ItemPath(ShadowType.F_ATTRIBUTES), attrDef, dto.getSearchText()));
conditions.add(EqualFilter.createEqual(new ItemPath(ShadowType.F_ATTRIBUTES), attrDef, dto.getSearchText()));
}
}

Expand Down
12 changes: 6 additions & 6 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRoles.java
View file
Expand Up @@ -321,16 +321,16 @@ private ObjectQuery createQuery(){
if(requestable == null){
query.setFilter(substring);
} else {
EqualsFilter boolFilter = EqualsFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
EqualFilter boolFilter = EqualFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
null, requestable);

if (requestable == true){
query.setFilter(AndFilter.createAnd(substring, boolFilter));

} else {
boolFilter = EqualsFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
boolFilter = EqualFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
null, false);
EqualsFilter nullFilter = EqualsFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
EqualFilter nullFilter = EqualFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
null, null);
OrFilter or = OrFilter.createOr(boolFilter, nullFilter);
query.setFilter(AndFilter.createAnd(substring, or));
Expand All @@ -342,16 +342,16 @@ private ObjectQuery createQuery(){
if(requestable == null){
query.setFilter(null);
} else {
EqualsFilter boolFilter = EqualsFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
EqualFilter boolFilter = EqualFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
null, requestable);

if (requestable == true){
query.setFilter(boolFilter);
}
else {
boolFilter = EqualsFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
boolFilter = EqualFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
null, false);
EqualsFilter nullFilter = EqualsFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
EqualFilter nullFilter = EqualFilter.createEqual(RoleType.F_REQUESTABLE, RoleType.class, getPrismContext(),
null, null);

OrFilter or = OrFilter.createOr(boolFilter, nullFilter);
Expand Down
6 changes: 3 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTasks.java
View file
Expand Up @@ -18,7 +18,7 @@

import com.evolveum.midpoint.prism.delta.ObjectDelta;
import com.evolveum.midpoint.prism.query.AndFilter;
import com.evolveum.midpoint.prism.query.EqualsFilter;
import com.evolveum.midpoint.prism.query.EqualFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
import com.evolveum.midpoint.schema.result.OperationResult;
Expand Down Expand Up @@ -1081,10 +1081,10 @@ private ObjectQuery createTaskQuery(){
}
}
if (category != null && !ALL_CATEGORIES.equals(category)) {
filters.add(EqualsFilter.createEqual(TaskType.F_CATEGORY, TaskType.class, getPrismContext(), null, category));
filters.add(EqualFilter.createEqual(TaskType.F_CATEGORY, TaskType.class, getPrismContext(), null, category));
}
if (!Boolean.TRUE.equals(showSubtasks)) {
filters.add(EqualsFilter.createEqual(TaskType.F_PARENT, TaskType.class, getPrismContext(), null));
filters.add(EqualFilter.createEqual(TaskType.F_PARENT, TaskType.class, getPrismContext(), null));
}
if (!filters.isEmpty()) {
query = new ObjectQuery().createObjectQuery(AndFilter.createAnd(filters));
Expand Down
6 changes: 3 additions & 3 deletions ...in/java/com/evolveum/midpoint/web/page/admin/server/dto/TaskDtoExecutionStatusFilter.java
View file
Expand Up @@ -17,7 +17,7 @@
package com.evolveum.midpoint.web.page.admin.server.dto;

import com.evolveum.midpoint.prism.PrismContext;
import com.evolveum.midpoint.prism.query.EqualsFilter;
import com.evolveum.midpoint.prism.query.EqualFilter;
import com.evolveum.midpoint.prism.query.NotFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.util.exception.SchemaException;
Expand Down Expand Up @@ -52,8 +52,8 @@ public ObjectFilter createFilter(Class clazz, PrismContext prismContext) throws
}
}

private EqualsFilter createExecutionStatusFilter(Class clazz, PrismContext prismContext, TaskExecutionStatusType value){
return EqualsFilter.createEqual(TaskType.F_EXECUTION_STATUS, clazz, prismContext, null, value);
private EqualFilter createExecutionStatusFilter(Class clazz, PrismContext prismContext, TaskExecutionStatusType value){
return EqualFilter.createEqual(TaskType.F_EXECUTION_STATUS, clazz, prismContext, null, value);
}


Expand Down
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
View file
Expand Up @@ -830,8 +830,8 @@ private ObjectQuery createTaskQuery(String oid) {
}
try {
filters.add(RefFilter.createReferenceEqual(TaskType.F_OBJECT_REF, TaskType.class, getPrismContext(), oid));
filters.add(NotFilter.createNot(EqualsFilter.createEqual(TaskType.F_EXECUTION_STATUS, TaskType.class, getPrismContext(), null, TaskExecutionStatusType.CLOSED)));
filters.add(EqualsFilter.createEqual(TaskType.F_PARENT, TaskType.class, getPrismContext(), null));
filters.add(NotFilter.createNot(EqualFilter.createEqual(TaskType.F_EXECUTION_STATUS, TaskType.class, getPrismContext(), null, TaskExecutionStatusType.CLOSED)));
filters.add(EqualFilter.createEqual(TaskType.F_PARENT, TaskType.class, getPrismContext(), null));
} catch (SchemaException e) {
throw new SystemException("Unexpected SchemaException when creating task filter", e);
}
Expand Down
14 changes: 7 additions & 7 deletions infra/prism/src/main/java/com/evolveum/midpoint/prism/parser/QueryConvertor.java
View file
Expand Up @@ -46,7 +46,7 @@
import com.evolveum.midpoint.prism.parser.util.XNodeProcessorUtil;
import com.evolveum.midpoint.prism.path.ItemPath;
import com.evolveum.midpoint.prism.query.AndFilter;
import com.evolveum.midpoint.prism.query.EqualsFilter;
import com.evolveum.midpoint.prism.query.EqualFilter;
import com.evolveum.midpoint.prism.query.NotFilter;
import com.evolveum.midpoint.prism.query.ObjectFilter;
import com.evolveum.midpoint.prism.query.ObjectQuery;
Expand Down Expand Up @@ -275,7 +275,7 @@ private static <C extends Containerable> NotFilter parseNotFilter(XNode xnode, P
return NotFilter.createNot(subfilter);
}

private static <T,C extends Containerable> EqualsFilter<PrismPropertyDefinition<T>> parseEqualFilter(XNode xnode, PrismContainerDefinition<C> pcd, PrismContext prismContext) throws SchemaException{
private static <T,C extends Containerable> EqualFilter<PrismPropertyDefinition<T>> parseEqualFilter(XNode xnode, PrismContainerDefinition<C> pcd, PrismContext prismContext) throws SchemaException{
LOGGER.trace("Start to parse EQUALS filter");
MapXNode xmap = toMap(xnode);
ItemPath itemPath = getPath(xmap, prismContext);
Expand All @@ -302,7 +302,7 @@ private static <T,C extends Containerable> EqualsFilter<PrismPropertyDefinition<
if (valueXnode != null) {

Item item = parseItem(valueXnode, itemName, itemDefinition, prismContext);
return EqualsFilter.createEqual(itemPath, (PrismProperty) item, matchingRule);
return EqualFilter.createEqual(itemPath, (PrismProperty) item, matchingRule);

} else {
Entry<QName,XNode> expressionEntry = xmap.getSingleEntryThatDoesNotMatch(
Expand All @@ -311,7 +311,7 @@ private static <T,C extends Containerable> EqualsFilter<PrismPropertyDefinition<
ExpressionWrapper expressionWrapper = new ExpressionWrapper();
PrismPropertyValue expressionPropertyValue = prismContext.getXnodeProcessor().parsePrismPropertyFromGlobalXNodeValue(expressionEntry);
expressionWrapper.setExpression(expressionPropertyValue.getValue());
return EqualsFilter.createEqual(itemPath, (PrismPropertyDefinition) itemDefinition, matchingRule, expressionWrapper);
return EqualFilter.createEqual(itemPath, (PrismPropertyDefinition) itemDefinition, matchingRule, expressionWrapper);
} else {
throw new SchemaException("No expression nor value in filter");
}
Expand Down Expand Up @@ -559,8 +559,8 @@ public static MapXNode serializeFilter(ObjectFilter filter, XNodeSerializer xnod
if (filter instanceof NotFilter) {
return serializeNotFilter((NotFilter) filter, xnodeSerilizer);
}
if (filter instanceof EqualsFilter) {
return serializeEqualsFilter((EqualsFilter) filter, xnodeSerilizer);
if (filter instanceof EqualFilter) {
return serializeEqualsFilter((EqualFilter) filter, xnodeSerilizer);
}
if (filter instanceof RefFilter) {
return serializeRefFilter((RefFilter) filter, xnodeSerilizer);
Expand Down Expand Up @@ -609,7 +609,7 @@ private static MapXNode serializeNotFilter(NotFilter filter, XNodeSerializer xno
return map;
}

private static <T> MapXNode serializeEqualsFilter(EqualsFilter<T> filter, XNodeSerializer xnodeSerializer) throws SchemaException{
private static <T> MapXNode serializeEqualsFilter(EqualFilter<T> filter, XNodeSerializer xnodeSerializer) throws SchemaException{

MapXNode map = new MapXNode();
map.put(KEY_FILTER_EQUAL, serializeValueFilter(filter, xnodeSerializer));
Expand Down

0 comments on commit 89675e2

Please sign in to comment.