Repository: olingo-odata4 Updated Branches: refs/heads/master 7d10c60c5 -> 570f4317c
[OLINGO-897] Cannot filter on derived properties startTypeFilter in MemberImpl is ignored. With this API change the member is passed to the visitor an thus the starttypefilter is available. Signed-off-by: Christian Amend <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/8406c58b Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/8406c58b Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/8406c58b Branch: refs/heads/master Commit: 8406c58b7f8e38a83c4735f589baa6318669c071 Parents: 7d10c60 Author: Jacek Sputowski <[email protected]> Authored: Wed Mar 9 11:27:02 2016 +0100 Committer: Christian Amend <[email protected]> Committed: Mon Mar 21 10:09:15 2016 +0100 ---------------------------------------------------------------------- .../expression/ExpressionVisitor.java | 3 +-- .../core/debug/ExpressionJsonVisitor.java | 24 +++++++------------- .../uri/queryoption/expression/MemberImpl.java | 2 +- .../expression/ExpressionVisitorImpl.java | 12 +++------- .../core/uri/testutil/FilterTreeToText.java | 12 +++------- 5 files changed, 16 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8406c58b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java index 224ddba..402db3a 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.server.api.ODataApplicationException; -import org.apache.olingo.server.api.uri.UriInfoResource; /** * Generic interface to define expression visitors with arbitrary return types. @@ -95,7 +94,7 @@ public interface ExpressionVisitor<T> { * @throws ExpressionVisitException Thrown if an exception while traversing occured * @throws ODataApplicationException Thrown by the application */ - T visitMember(UriInfoResource member) throws ExpressionVisitException, ODataApplicationException; + T visitMember(Member member) throws ExpressionVisitException, ODataApplicationException; /** * Called for each traversed {@link Alias} expression http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8406c58b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ExpressionJsonVisitor.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ExpressionJsonVisitor.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ExpressionJsonVisitor.java index bf37973..a8b22e9 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ExpressionJsonVisitor.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/debug/ExpressionJsonVisitor.java @@ -18,28 +18,20 @@ */ package org.apache.olingo.server.core.debug; -import java.util.List; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.server.api.ODataApplicationException; -import org.apache.olingo.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.UriResource; import org.apache.olingo.server.api.uri.UriResourceLambdaAll; import org.apache.olingo.server.api.uri.UriResourceLambdaAny; import org.apache.olingo.server.api.uri.UriResourcePartTyped; -import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind; -import org.apache.olingo.server.api.uri.queryoption.expression.Expression; -import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; -import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.server.api.uri.queryoption.expression.Literal; -import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; -import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind; +import org.apache.olingo.server.api.uri.queryoption.expression.*; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.List; /** * A custom expression visitor which converts the tree into a {@link JsonNode} tree. @@ -134,9 +126,9 @@ public class ExpressionJsonVisitor implements ExpressionVisitor<JsonNode> { } @Override - public JsonNode visitMember(final UriInfoResource member) + public JsonNode visitMember(final Member member) throws ExpressionVisitException, ODataApplicationException { - final List<UriResource> uriResourceParts = member.getUriResourceParts(); + final List<UriResource> uriResourceParts = member.getResourcePath().getUriResourceParts(); ObjectNode result = nodeFactory.objectNode() .put(NODE_TYPE_NAME, MEMBER_NAME) .put(TYPE_NAME, getType(uriResourceParts)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8406c58b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java index fe5cb87..3306565 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MemberImpl.java @@ -52,7 +52,7 @@ public class MemberImpl implements Member { @Override public <T> T accept(final ExpressionVisitor<T> visitor) throws ExpressionVisitException, ODataApplicationException { - return visitor.visitMember(path); + return visitor.visitMember(this); } @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8406c58b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java index a2ff719..3748ab8 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/ExpressionVisitorImpl.java @@ -38,13 +38,7 @@ import org.apache.olingo.server.api.uri.UriParameter; import org.apache.olingo.server.api.uri.UriResource; import org.apache.olingo.server.api.uri.UriResourceFunction; import org.apache.olingo.server.api.uri.UriResourceProperty; -import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind; -import org.apache.olingo.server.api.uri.queryoption.expression.Expression; -import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; -import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.server.api.uri.queryoption.expression.Literal; -import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; -import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind; +import org.apache.olingo.server.api.uri.queryoption.expression.*; import org.apache.olingo.server.tecsvc.data.DataProvider; import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operand.TypedOperand; import org.apache.olingo.server.tecsvc.processor.queryoptions.expression.operand.UntypedOperand; @@ -184,10 +178,10 @@ public class ExpressionVisitorImpl implements ExpressionVisitor<VisitorOperand> } @Override - public VisitorOperand visitMember(final UriInfoResource member) throws ExpressionVisitException, + public VisitorOperand visitMember(final Member member) throws ExpressionVisitException, ODataApplicationException { - final List<UriResource> uriResourceParts = member.getUriResourceParts(); + final List<UriResource> uriResourceParts = member.getResourcePath().getUriResourceParts(); // UriResourceParts contains at least one UriResource. final UriResource initialPart = uriResourceParts.get(0); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8406c58b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java index 96a3226..a083c67 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java @@ -29,13 +29,7 @@ import org.apache.olingo.server.api.uri.UriResourceLambdaAll; import org.apache.olingo.server.api.uri.UriResourceLambdaAny; import org.apache.olingo.server.api.uri.UriResourcePartTyped; import org.apache.olingo.server.api.uri.queryoption.FilterOption; -import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKind; -import org.apache.olingo.server.api.uri.queryoption.expression.Expression; -import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; -import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor; -import org.apache.olingo.server.api.uri.queryoption.expression.Literal; -import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; -import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind; +import org.apache.olingo.server.api.uri.queryoption.expression.*; public class FilterTreeToText implements ExpressionVisitor<String> { @@ -88,10 +82,10 @@ public class FilterTreeToText implements ExpressionVisitor<String> { } @Override - public String visitMember(final UriInfoResource resource) throws ExpressionVisitException, ODataApplicationException { + public String visitMember(final Member member) throws ExpressionVisitException, ODataApplicationException { String ret = ""; - for (UriResource item : resource.getUriResourceParts()) { + for (UriResource item : member.getResourcePath().getUriResourceParts()) { String tmp = ""; if (item instanceof UriResourceLambdaAll) { UriResourceLambdaAll all = (UriResourceLambdaAll) item;
