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 2014/11/18 16:12:16 UTC
[15/22] olingo-odata4 git commit: Merge branch 'master' into olingo472
Merge branch 'master' into olingo472
Conflicts:
lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
lib/server-core/src/main/resources/server-core-exceptions-i18n.properties
lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/4f820fe5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/4f820fe5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/4f820fe5
Branch: refs/heads/master
Commit: 4f820fe533ac6da8ce8a223dbd069c899ea9f307
Parents: ad177ac c2c8bf1
Author: Christian Amend <ch...@apache.org>
Authored: Thu Nov 13 17:27:36 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Thu Nov 13 17:27:36 2014 +0100
----------------------------------------------------------------------
.../org/apache/olingo/server/api/OData.java | 9 +-
.../processor/ComplexCollectionProcessor.java | 46 +++
.../server/api/processor/ComplexProcessor.java | 45 +++
.../CountEntityCollectionProcessor.java | 45 +++
.../processor/EntityCollectionProcessor.java | 44 +++
.../server/api/processor/EntityProcessor.java | 16 +-
.../api/processor/EntitySetProcessor.java | 58 ---
.../api/processor/ExceptionProcessor.java | 10 +-
.../server/api/processor/MetadataProcessor.java | 14 +-
.../processor/PrimitiveCollectionProcessor.java | 46 +++
.../api/processor/PrimitiveProcessor.java | 60 +++
.../server/api/processor/PropertyProcessor.java | 62 ---
.../api/processor/ServiceDocumentProcessor.java | 14 +-
.../serializer/ComplexSerializerOptions.java | 86 ++++
.../EntityCollectionSerializerOptions.java | 97 +++++
.../api/serializer/EntitySerializerOptions.java | 85 ++++
.../api/serializer/FixedFormatSerializer.java | 48 +++
.../server/api/serializer/ODataSerializer.java | 75 ++--
.../api/serializer/ODataSerializerOptions.java | 99 -----
.../serializer/PrimitiveSerializerOptions.java | 131 ++++++
.../PrimitiveValueSerializerOptions.java | 118 ++++++
.../api/serializer/SerializerException.java | 3 +-
.../apache/olingo/server/core/ODataHandler.java | 162 ++++----
.../apache/olingo/server/core/ODataImpl.java | 9 +-
.../serializer/FixedFormatSerializerImpl.java | 59 +++
.../core/serializer/ODataXmlSerializerImpl.java | 126 ------
.../serializer/json/ODataJsonSerializer.java | 250 ++++++++----
.../serializer/utils/ContextURLBuilder.java | 6 +-
.../core/serializer/utils/ContextURLHelper.java | 26 +-
.../serializer/xml/ODataXmlSerializerImpl.java | 154 ++++++++
.../server/core/uri/validator/UriValidator.java | 7 +-
.../server-core-exceptions-i18n.properties | 1 +
.../server/core/ODataHttpHandlerImplTest.java | 5 +-
.../serializer/FixedFormatSerializerTest.java | 57 +++
.../serializer/utils/ContextURLBuilderTest.java | 5 +-
.../olingo/server/tecsvc/TechnicalServlet.java | 6 +-
.../processor/TechnicalEntityProcessor.java | 161 ++++++++
.../TechnicalPrimitiveComplexProcessor.java | 243 ++++++++++++
.../tecsvc/processor/TechnicalProcessor.java | 291 +-------------
.../core/ODataHandlerExceptionHandlingTest.java | 210 ----------
.../olingo/server/core/ODataHandlerTest.java | 395 +++++++++----------
.../json/ODataJsonSerializerTest.java | 154 +++++---
.../core/uri/validator/UriValidatorTest.java | 1 -
.../olingo/server/sample/data/DataProvider.java | 3 -
.../server/sample/processor/CarsProcessor.java | 81 ++--
45 files changed, 2270 insertions(+), 1353 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4f820fe5/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
index af092cf,f72b6bd..9be403c
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java
@@@ -35,10 -35,11 +35,13 @@@ import org.apache.olingo.server.api.ODa
import org.apache.olingo.server.api.ODataResponse;
import org.apache.olingo.server.api.ODataServerError;
import org.apache.olingo.server.api.ServiceMetadata;
+import org.apache.olingo.server.api.batch.BatchException;
+import org.apache.olingo.server.api.processor.BatchProcessor;
+ import org.apache.olingo.server.api.processor.ComplexCollectionProcessor;
+ import org.apache.olingo.server.api.processor.ComplexProcessor;
+ import org.apache.olingo.server.api.processor.CountEntityCollectionProcessor;
import org.apache.olingo.server.api.processor.DefaultProcessor;
- import org.apache.olingo.server.api.processor.EntitySetProcessor;
+ import org.apache.olingo.server.api.processor.EntityCollectionProcessor;
import org.apache.olingo.server.api.processor.EntityProcessor;
import org.apache.olingo.server.api.processor.ExceptionProcessor;
import org.apache.olingo.server.api.processor.MetadataProcessor;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4f820fe5/lib/server-core/src/main/resources/server-core-exceptions-i18n.properties
----------------------------------------------------------------------
diff --cc lib/server-core/src/main/resources/server-core-exceptions-i18n.properties
index 7e58fc6,522c3a0..ece835d
--- a/lib/server-core/src/main/resources/server-core-exceptions-i18n.properties
+++ b/lib/server-core/src/main/resources/server-core-exceptions-i18n.properties
@@@ -94,24 -94,4 +94,25 @@@ SerializerException.UNSUPPORTED_PROPERT
SerializerException.INCONSISTENT_PROPERTY_TYPE=An inconsistency has been detected in the type definition of property '%1$s'.
SerializerException.MISSING_PROPERTY=The non-nullable property '%1$s' is missing.
SerializerException.WRONG_PROPERTY_VALUE=The value '%2$s' is not valid for property '%1$s'.
+ SerializerException.WRONG_PRIMITIVE_VALUE=The value '%2$s' is not valid for the primitive type '%1$s' and the given facets.
+
+BatchException.INVALID_BOUNDARY=Invalid boundary at line '%1$s'.
+BatchException.INVALID_CHANGESET_METHOD=Invalid method: a ChangeSet cannot contain retrieve requests at line '%1$s'.
+BatchException.INVALID_CONTENT=Retrieve requests must not contain any body content '%1$s'.
+BatchException.INVALID_CONTENT_LENGTH=Invalid content length: content length have to be an integer and positive at line '%1$s'.
+BatchException.INVALID_CONTENT_TRANSFER_ENCODING=The Content-Transfer-Encoding should be binary: line '%1$s'.
+BatchException.INVALID_CONTENT_TYPE=Content-Type should be '%1$s'.
+BatchException.INVALID_HEADER=Invalid header: '%1$s' at line '%2$s'.
+BatchException.INVALID_HTTP_VERSION=Invalid HTTP version: The version have to be HTTP/1.1 at line '%1$s'.
+BatchException.INVALID_METHOD=Invalid HTTP method at line '%1$s'.
+BatchException.INVALID_QUERY_OPERATION_METHOD=Invalid method: a query operation can only contain retrieve requests at line '%1$s'.
+BatchException.INVALID_STATUS_LINE=Invalid HTTP status line at line '%1$s'.
+BatchException.INVALID_URI=Invalid URI at line '%1$s'.
+BatchException.FORBIDDEN_HEADER=Forbidden header at line '%1$s'.
+BatchException.MISSING_BLANK_LINE=Missing blank line at line '%1$s'.
+BatchException.MISSING_BOUNDARY_DELIMITER=Missing boundary delimiter at line '%1$s'.
+BatchException.MISSING_CLOSE_DELIMITER=Missing close delimiter at line '%1$s'.
+BatchException.MISSING_CONTENT_ID=Missing content-id at line '%1$s'.
+BatchException.MISSING_CONTENT_TRANSFER_ENCODING=Missing content transfer encoding at line '%1$s'.
+BatchException.MISSING_CONTENT_TYPE=Missing content-type at line '%1$s'.
+BatchException.MISSING_MANDATORY_HEADER=Missing mandatory header at line '%1$s'.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/4f820fe5/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
----------------------------------------------------------------------
diff --cc lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
index e5a0d44,62c0140..4fa3d36
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
@@@ -18,10 -18,6 +18,7 @@@
*/
package org.apache.olingo.server.tecsvc.processor;
- import java.io.ByteArrayInputStream;
- import java.io.IOException;
- import java.io.UnsupportedEncodingException;
- import java.util.LinkedList;
++
import java.util.List;
import java.util.Locale;