You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2016/02/22 08:54:32 UTC
[08/21] olingo-odata4 git commit: [OLINGO-832] Reverted change for
inline entities
[OLINGO-832] Reverted change for inline entities
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/1a7c28a7
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/1a7c28a7
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/1a7c28a7
Branch: refs/heads/master
Commit: 1a7c28a7438efcfdeeb66a545d47e591010997bb
Parents: c6d45d9
Author: mibo <mi...@apache.org>
Authored: Sun Jan 31 17:43:55 2016 +0100
Committer: mibo <mi...@apache.org>
Committed: Sun Jan 31 17:43:55 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/olingo/commons/api/data/Link.java | 6 +++---
.../apache/olingo/server/api/serializer/ODataSerializer.java | 5 +++--
.../server/core/serializer/json/ODataJsonStreamSerializer.java | 3 ++-
.../olingo/server/core/serializer/xml/ODataXmlSerializer.java | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a7c28a7/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
index 996e378..0bf8237 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java
@@ -32,7 +32,7 @@ public class Link extends Annotatable {
private String type;
private String mediaETag;
private Entity entity;
- private AbstractEntityCollection entitySet;
+ private EntityCollection entitySet;
private String bindingLink;
private List<String> bindingLinks = new ArrayList<String>();
@@ -149,7 +149,7 @@ public class Link extends Annotatable {
*
* @return in-line entity set.
*/
- public AbstractEntityCollection getInlineEntitySet() {
+ public EntityCollection getInlineEntitySet() {
return entitySet;
}
@@ -158,7 +158,7 @@ public class Link extends Annotatable {
*
* @param entitySet entity set.
*/
- public void setInlineEntitySet(final AbstractEntityCollection entitySet) {
+ public void setInlineEntitySet(final EntityCollection entitySet) {
this.entitySet = entitySet;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a7c28a7/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
index 3deb396..57370ba 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
@@ -128,8 +128,9 @@ public interface ODataSerializer {
* @param metadata metadata for the service
* @param edmEntitySet {@link EdmEntitySet}
* @param entityCollection data of the entity collection
- * @param ReferenceCollectionSerializerOptions {@link ReferenceCollectionSerializerOptions}
+ * @param options {@link ReferenceCollectionSerializerOptions}
*/
SerializerResult referenceCollection(ServiceMetadata metadata, EdmEntitySet edmEntitySet,
- AbstractEntityCollection entityCollection, ReferenceCollectionSerializerOptions options) throws SerializerException;
+ AbstractEntityCollection entityCollection, ReferenceCollectionSerializerOptions options)
+ throws SerializerException;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a7c28a7/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonStreamSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonStreamSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonStreamSerializer.java
index a7bd4f4..406fbe7 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonStreamSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonStreamSerializer.java
@@ -21,6 +21,7 @@ package org.apache.olingo.server.core.serializer.json;
import com.fasterxml.jackson.core.JsonFactory;
import com.fasterxml.jackson.core.JsonGenerator;
import org.apache.olingo.commons.api.Constants;
+import org.apache.olingo.commons.api.data.AbstractEntityCollection;
import org.apache.olingo.commons.api.data.ContextURL;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
@@ -51,7 +52,7 @@ public class ODataJsonStreamSerializer extends ODataJsonSerializer {
@Override
public SerializerResult entityCollection(final ServiceMetadata metadata,
- final EdmEntityType entityType, final EntityCollection entitySet,
+ final EdmEntityType entityType, final AbstractEntityCollection entitySet,
final EntityCollectionSerializerOptions options) throws SerializerException {
EntityIterator coll;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/1a7c28a7/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
index 70d797f..b3d9d5d 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java
@@ -556,7 +556,7 @@ public class ODataXmlSerializer extends AbstractODataSerializer {
link.setRel(Constants.NS_NAVIGATION_LINK_REL + navigationPropertyName);
link.setType(Constants.ENTITY_SET_NAVIGATION_LINK_TYPE);
link.setTitle(navigationPropertyName);
- AbstractEntityCollection target = new EntityCollection();
+ EntityCollection target = new EntityCollection();
link.setInlineEntitySet(target);
if (linked.getId() != null) {
link.setHref(linked.getId().toASCIIString() + "/" + navigationPropertyName);