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/01/14 16:02:23 UTC
olingo-odata4 git commit: [OLINGO-530] Javadoc and cleanup unused
imports
Repository: olingo-odata4
Updated Branches:
refs/heads/master 1c735e89b -> 0aad7c037
[OLINGO-530] Javadoc and cleanup unused imports
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0aad7c03
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0aad7c03
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0aad7c03
Branch: refs/heads/master
Commit: 0aad7c037c6f525cef7991e8c608eba5eda33d18
Parents: 1c735e8
Author: Christian Amend <ch...@apache.org>
Authored: Wed Jan 14 15:53:24 2015 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Wed Jan 14 15:53:24 2015 +0100
----------------------------------------------------------------------
.../org/apache/olingo/fit/v3/BatchTestITCase.java | 2 +-
.../org/apache/olingo/fit/v4/BatchTestITCase.java | 2 +-
.../server/api/deserializer/ODataDeserializer.java | 17 +++++++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0aad7c03/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
index fe440f6..74d6cb1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
@@ -301,7 +301,7 @@ public class BatchTestITCase extends AbstractTestITCase {
}
@Test
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({ "unchecked", "rawtypes" })
public void batchRequest() throws EdmPrimitiveTypeException {
// create your request
final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testStaticServiceRootURL);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0aad7c03/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
index 3303f97..62f0f25 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
@@ -390,7 +390,7 @@ public class BatchTestITCase extends AbstractTestITCase {
}
@Test
- @SuppressWarnings({"unchecked"})
+ @SuppressWarnings({"unchecked", "rawtypes"})
public void batchRequest() throws EdmPrimitiveTypeException {
// create your request
final ODataBatchRequest request = client.getBatchRequestFactory().getBatchRequest(testStaticServiceRootURL);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0aad7c03/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
index 6c5fc39..3da134b 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java
@@ -24,10 +24,27 @@ import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntitySet;
import org.apache.olingo.commons.api.edm.EdmEntityType;
+/**
+ * Deserializer on OData server side.
+ */
public interface ODataDeserializer {
+ /**
+ * Deserializes an entity stream into an {@link Entity} object.
+ * @param stream
+ * @param edmEntityType
+ * @return deserialized {@link Entity} object
+ * @throws DeserializerException
+ */
Entity entity(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException;
+ /**
+ * Deserializes an entity collection stream into an {@link EntitySet} object.
+ * @param stream
+ * @param edmEntityType
+ * @return deserialized {@link EntitySet} object
+ * @throws DeserializerException
+ */
EntitySet entityCollection(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException;
}