From eedc587bed12a708f870b592ba2f5c28fda53a7a Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Fri, 5 May 2017 09:59:17 +0200 Subject: [PATCH] [Minor] Added identity visitors to queries, eliminating NoStrategy usage --- .../li/strolch/model/query/ActivityQuery.java | 17 +++++++++++------ .../li/strolch/model/query/OrderQuery.java | 18 ++++++++++++------ .../li/strolch/model/query/ResourceQuery.java | 15 ++++++++++----- .../model/query/parser/QueryParser.java | 6 ------ 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java b/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java index 230dd4d4f..ccac01566 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java +++ b/li.strolch.model/src/main/java/li/strolch/model/query/ActivityQuery.java @@ -19,7 +19,6 @@ import li.strolch.model.activity.Action; import li.strolch.model.activity.Activity; import li.strolch.model.query.ordering.StrolchQueryOrdering; import li.strolch.model.visitor.ActivityVisitor; -import li.strolch.model.visitor.NoStrategyActivityVisitor; import li.strolch.utils.dbc.DBC; /** @@ -50,16 +49,24 @@ public class ActivityQuery extends StrolchElementQuery public ActivityQuery() { super(); + setIdentityVisitor(); } public ActivityQuery(Navigation navigation) { super(navigation); + setIdentityVisitor(); + } + + private void setIdentityVisitor() { + @SuppressWarnings("unchecked") + ActivityVisitor identityVisitor = t -> (U) t; + this.activityVisitor = identityVisitor; } public ActivityVisitor getActivityVisitor() { return this.activityVisitor; } - + @Override public ActivityQuery internal() { super.internal(); @@ -107,13 +114,11 @@ public class ActivityQuery extends StrolchElementQuery } public static ActivityQuery query(String type) { - return new ActivityQuery(new StrolchTypeNavigation(type)) - .setActivityVisitor(new NoStrategyActivityVisitor()); + return new ActivityQuery(new StrolchTypeNavigation(type)); } public static ActivityQuery query(String type, StrolchQueryOrdering ordering) { - return new ActivityQuery(new StrolchTypeNavigation(type)) - .setActivityVisitor(new NoStrategyActivityVisitor()).setOrdering(ordering); + return new ActivityQuery(new StrolchTypeNavigation(type)).setOrdering(ordering); } public static ActivityQuery query(String type, ActivityVisitor activityVisitor) { diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java b/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java index 17c110a70..9f3b437a0 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java +++ b/li.strolch.model/src/main/java/li/strolch/model/query/OrderQuery.java @@ -18,7 +18,6 @@ package li.strolch.model.query; import li.strolch.model.Order; import li.strolch.model.parameter.Parameter; import li.strolch.model.query.ordering.StrolchQueryOrdering; -import li.strolch.model.visitor.NoStrategyOrderVisitor; import li.strolch.model.visitor.OrderVisitor; import li.strolch.utils.dbc.DBC; @@ -50,16 +49,24 @@ public class OrderQuery extends StrolchElementQuery { public OrderQuery() { super(); + setIdentityVisitor(); } public OrderQuery(Navigation navigation) { super(navigation); + setIdentityVisitor(); + } + + private void setIdentityVisitor() { + @SuppressWarnings("unchecked") + OrderVisitor identityVisitor = t -> (U) t; + this.orderVisitor = identityVisitor; } public OrderVisitor getOrderVisitor() { return this.orderVisitor; } - + @Override public OrderQuery internal() { super.internal(); @@ -108,12 +115,11 @@ public class OrderQuery extends StrolchElementQuery { } public static OrderQuery query(String type) { - return new OrderQuery(new StrolchTypeNavigation(type)).setOrderVisitor(new NoStrategyOrderVisitor()); + return new OrderQuery(new StrolchTypeNavigation(type)); } public static OrderQuery query(String type, StrolchQueryOrdering ordering) { - return new OrderQuery(new StrolchTypeNavigation(type)).setOrderVisitor(new NoStrategyOrderVisitor()) - .setOrdering(ordering); + return new OrderQuery(new StrolchTypeNavigation(type)).setOrdering(ordering); } public static OrderQuery query(String type, OrderVisitor orderVisitor) { @@ -121,6 +127,6 @@ public class OrderQuery extends StrolchElementQuery { } public static OrderQuery query(String type, OrderVisitor orderVisitor, StrolchQueryOrdering ordering) { - return new OrderQuery(new StrolchTypeNavigation(type)).setOrdering(ordering).setOrderVisitor(orderVisitor); + return new OrderQuery(new StrolchTypeNavigation(type)).setOrdering(ordering); } } diff --git a/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java b/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java index d9d020c53..b15340a8f 100644 --- a/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java +++ b/li.strolch.model/src/main/java/li/strolch/model/query/ResourceQuery.java @@ -18,7 +18,6 @@ package li.strolch.model.query; import li.strolch.model.Resource; import li.strolch.model.parameter.Parameter; import li.strolch.model.query.ordering.StrolchQueryOrdering; -import li.strolch.model.visitor.NoStrategyResourceVisitor; import li.strolch.model.visitor.ResourceVisitor; import li.strolch.utils.dbc.DBC; @@ -50,10 +49,18 @@ public class ResourceQuery extends StrolchElementQuery public ResourceQuery() { super(); + setIdentityVisitor(); } public ResourceQuery(Navigation navigation) { super(navigation); + setIdentityVisitor(); + } + + private void setIdentityVisitor() { + @SuppressWarnings("unchecked") + ResourceVisitor identityVisitor = t -> (U) t; + this.resourceVisitor = identityVisitor; } public ResourceVisitor getResourceVisitor() { @@ -108,13 +115,11 @@ public class ResourceQuery extends StrolchElementQuery } public static ResourceQuery query(String type) { - return new ResourceQuery(new StrolchTypeNavigation(type)) - .setResourceVisitor(new NoStrategyResourceVisitor()); + return new ResourceQuery(new StrolchTypeNavigation(type)); } public static ResourceQuery query(String type, StrolchQueryOrdering ordering) { - return new ResourceQuery(new StrolchTypeNavigation(type)) - .setResourceVisitor(new NoStrategyResourceVisitor()).setOrdering(ordering); + return new ResourceQuery(new StrolchTypeNavigation(type)).setOrdering(ordering); } public static ResourceQuery query(String type, ResourceVisitor resourceVisitor) { diff --git a/li.strolch.rest/src/main/java/li/strolch/model/query/parser/QueryParser.java b/li.strolch.rest/src/main/java/li/strolch/model/query/parser/QueryParser.java index bb1318b17..76afa3f7c 100644 --- a/li.strolch.rest/src/main/java/li/strolch/model/query/parser/QueryParser.java +++ b/li.strolch.rest/src/main/java/li/strolch/model/query/parser/QueryParser.java @@ -25,9 +25,6 @@ import li.strolch.model.query.ParameterSelection; import li.strolch.model.query.ResourceQuery; import li.strolch.model.query.StrolchElementQuery; import li.strolch.model.query.StrolchTypeNavigation; -import li.strolch.model.visitor.NoStrategyActivityVisitor; -import li.strolch.model.visitor.NoStrategyOrderVisitor; -import li.strolch.model.visitor.NoStrategyResourceVisitor; import li.strolch.utils.StringMatchMode; import li.strolch.utils.collections.MapOfSets; @@ -217,7 +214,6 @@ public abstract class QueryParser extends CompositeParser { }; Result result = parser.parse(queryString); ResourceQuery query = result.get(); - query.setResourceVisitor(new NoStrategyResourceVisitor()); if (!query.hasSelection() && withAny) { query.withAny(); @@ -250,7 +246,6 @@ public abstract class QueryParser extends CompositeParser { }; Result result = parser.parse(queryString); OrderQuery query = result.get(); - query.setOrderVisitor(new NoStrategyOrderVisitor()); if (!query.hasSelection() && withAny) { query.withAny(); @@ -284,7 +279,6 @@ public abstract class QueryParser extends CompositeParser { }; Result result = parser.parse(queryString); ActivityQuery query = result.get(); - query.setActivityVisitor(new NoStrategyActivityVisitor()); if (!query.hasSelection() && withAny) { query.withAny();