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/09/30 15:12:04 UTC
[2/3] olingo-odata4 git commit: [OLINGO-781] TecSvc: The atom id for
functions without entity set is calculated by the URI of the function
[OLINGO-781] TecSvc: The atom id for functions without entity set is
calculated by the URI of the function
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b7dcae86
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b7dcae86
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b7dcae86
Branch: refs/heads/master
Commit: b7dcae862ae226b1f2da43270418e14199af1a06
Parents: 64388ec
Author: Christia Holzer <c....@sap.com>
Authored: Tue Sep 29 15:44:10 2015 +0200
Committer: Christia Holzer <c....@sap.com>
Committed: Wed Sep 30 15:04:23 2015 +0200
----------------------------------------------------------------------
.../server/tecsvc/processor/TechnicalEntityProcessor.java | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/b7dcae86/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 59d9a2a..b9afddd 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
@@ -506,8 +506,15 @@ public class TechnicalEntityProcessor extends TechnicalProcessor
expand);
expandHandler.applyExpandQueryOptions(entitySetSerialization, edmEntitySet, expand);
final CountOption countOption = uriInfo.getCountOption();
+
+ String id;
+ if(edmEntitySet == null) {
+ // Used for functions, function imports etc.
+ id = request.getRawODataPath();
+ } else {
+ id = request.getRawBaseUri() + edmEntitySet.getName();
+ }
- final String id = request.getRawBaseUri() + edmEntitySet.getName();
// Serialize
final SerializerResult serializerResult = (isReference) ?
serializeReferenceCollection(entitySetSerialization, edmEntitySet, requestedContentType, countOption) :