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 2015/06/23 10:18:40 UTC
[2/2] olingo-odata4 git commit: [OLINGO-698] fix for navigation from
function in technical service
[OLINGO-698] fix for navigation from function in technical service
Signed-off-by: Christian Amend <ch...@sap.com>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a3fbf39f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a3fbf39f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a3fbf39f
Branch: refs/heads/master
Commit: a3fbf39f535d47d48d4aa60e3a4f9d305b8f837f
Parents: bfb5c93
Author: Klaus Straubinger <kl...@sap.com>
Authored: Fri Jun 19 16:43:21 2015 +0200
Committer: Christian Amend <ch...@sap.com>
Committed: Tue Jun 23 10:13:47 2015 +0200
----------------------------------------------------------------------
.../server/tecsvc/processor/TechnicalEntityProcessor.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a3fbf39f/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
index ccf8189..807c815 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalEntityProcessor.java
@@ -40,8 +40,8 @@ import org.apache.olingo.server.api.ODataResponse;
import org.apache.olingo.server.api.ServiceMetadata;
import org.apache.olingo.server.api.deserializer.DeserializerResult;
import org.apache.olingo.server.api.deserializer.ODataDeserializer;
-import org.apache.olingo.server.api.prefer.PreferencesApplied;
import org.apache.olingo.server.api.prefer.Preferences.Return;
+import org.apache.olingo.server.api.prefer.PreferencesApplied;
import org.apache.olingo.server.api.processor.CountEntityCollectionProcessor;
import org.apache.olingo.server.api.processor.EntityCollectionProcessor;
import org.apache.olingo.server.api.processor.EntityProcessor;
@@ -53,8 +53,8 @@ import org.apache.olingo.server.api.serializer.EntitySerializerOptions;
import org.apache.olingo.server.api.serializer.SerializerResult;
import org.apache.olingo.server.api.uri.UriInfo;
import org.apache.olingo.server.api.uri.UriResourceEntitySet;
-import org.apache.olingo.server.api.uri.UriResourceFunction;
import org.apache.olingo.server.api.uri.UriResourceNavigation;
+import org.apache.olingo.server.api.uri.UriResourcePartTyped;
import org.apache.olingo.server.api.uri.queryoption.CountOption;
import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
import org.apache.olingo.server.api.uri.queryoption.IdOption;
@@ -382,7 +382,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor
throws ODataApplicationException, ODataLibraryException {
final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo);
final EdmEntityType edmEntityType = edmEntitySet == null ?
- (EdmEntityType) ((UriResourceFunction) uriInfo.getUriResourceParts()
+ (EdmEntityType) ((UriResourcePartTyped) uriInfo.getUriResourceParts()
.get(uriInfo.getUriResourceParts().size() - 1)).getType() :
edmEntitySet.getEntityType();
@@ -421,7 +421,7 @@ public class TechnicalEntityProcessor extends TechnicalProcessor
throws ODataApplicationException, ODataLibraryException {
final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
final EdmEntityType edmEntityType = edmEntitySet == null ?
- (EdmEntityType) ((UriResourceFunction) uriInfo.getUriResourceParts()
+ (EdmEntityType) ((UriResourcePartTyped) uriInfo.getUriResourceParts()
.get(uriInfo.getUriResourceParts().size() - 1)).getType() :
edmEntitySet.getEntityType();