You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2016/03/22 14:42:13 UTC

olingo-odata4 git commit: [OLINGO-897] Fix tutorials after API change in filter visitor

Repository: olingo-odata4
Updated Branches:
  refs/heads/master b6c7d401e -> 3786699f0


[OLINGO-897] Fix tutorials after API change in filter visitor


Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/3786699f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/3786699f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/3786699f

Branch: refs/heads/master
Commit: 3786699f018ac2deb1df9571d12bb61ab57f2d8a
Parents: b6c7d40
Author: Christian Amend <ch...@sap.com>
Authored: Tue Mar 22 14:33:28 2016 +0100
Committer: Christian Amend <ch...@sap.com>
Committed: Tue Mar 22 14:34:17 2016 +0100

----------------------------------------------------------------------
 .../myservice/mynamespace/service/FilterExpressionVisitor.java  | 5 +++--
 .../myservice/mynamespace/service/FilterExpressionVisitor.java  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3786699f/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java b/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
index 811833a..57b16e4 100644
--- a/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
+++ b/samples/tutorials/p0_all/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
@@ -35,6 +35,7 @@ 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.Member;
 import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind;
 import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind;
 
@@ -46,11 +47,11 @@ public class FilterExpressionVisitor implements ExpressionVisitor<Object> {
     this.currentEntity = currentEntity;
 	}
 
-  public Object visitMember(UriInfoResource member) throws ExpressionVisitException, ODataApplicationException {
+  public Object visitMember(final Member member) throws ExpressionVisitException, ODataApplicationException {
     // To keeps things simple, this tutorial allows only primitive properties.
     // We have faith that the java type of Edm.Int32 is Integer
     
-    final List<UriResource> uriResourceParts = member.getUriResourceParts();
+    final List<UriResource> uriResourceParts = member.getResourcePath().getUriResourceParts();
     
     // Make sure that the resource path of the property contains only a single segment and a primitive property
     // has been addressed. We can be sure, that the property exists because the UriParser checks if the

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/3786699f/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java b/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
index 12d6e30..39d482d 100644
--- a/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
+++ b/samples/tutorials/p8_queryoptions-f/src/main/java/myservice/mynamespace/service/FilterExpressionVisitor.java
@@ -35,6 +35,7 @@ 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.Member;
 import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind;
 import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind;
 
@@ -47,11 +48,11 @@ public class FilterExpressionVisitor implements ExpressionVisitor<Object> {
 	}
 
   @Override
-  public Object visitMember(UriInfoResource member) throws ExpressionVisitException, ODataApplicationException {
+  public Object visitMember(final Member member) throws ExpressionVisitException, ODataApplicationException {
     // To keeps things simple, this tutorial allows only primitive properties.
     // We have faith that the java type of Edm.Int32 is Integer
     
-    final List<UriResource> uriResourceParts = member.getUriResourceParts();
+    final List<UriResource> uriResourceParts = member.getResourcePath().getUriResourceParts();
     
     // Make sure that the resource path of the property contains only a single segment and a primitive property
     // has been addressed. We can be sure, that the property exists because the UriParser checks if the