[OLINGO-699] Moved serializer code to client module
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/20351253 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/20351253 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/20351253 Branch: refs/heads/master Commit: 20351253e2c00f6593cf4136375f1157c9310af5 Parents: a6d20f6 Author: Christian Amend <[email protected]> Authored: Mon Jun 15 10:48:03 2015 +0200 Committer: Christian Amend <[email protected]> Committed: Mon Jun 15 10:48:03 2015 +0200 ---------------------------------------------------------------------- fit/pom.xml | 12 +- .../org/apache/olingo/fit/AbstractServices.java | 10 +- .../fit/serializer/FITAtomDeserializer.java | 2 +- .../olingo/fit/utils/AbstractUtilities.java | 14 +- .../org/apache/olingo/fit/utils/FSManager.java | 6 +- .../olingo/fit/AbstractBaseTestITCase.java | 2 +- .../apache/olingo/client/api/ODataClient.java | 2 +- .../api/domain/ClientEntitySetIterator.java | 2 +- .../serialization/ClientODataDeserializer.java | 2 - .../api/serialization/ODataDeserializer.java | 65 ++ .../ODataDeserializerException.java | 38 + .../client/api/serialization/ODataReader.java | 1 - .../api/serialization/ODataSerializer.java | 33 + .../serialization/ODataSerializerException.java | 38 + .../client/api/serialization/ODataWriter.java | 1 - .../olingo/client/core/ODataClientImpl.java | 6 +- .../header/ODataErrorResponseChecker.java | 2 +- .../cud/ODataEntityCreateRequestImpl.java | 4 +- .../cud/ODataEntityUpdateRequestImpl.java | 4 +- .../cud/ODataPropertyUpdateRequestImpl.java | 4 +- .../cud/ODataReferenceAddingRequestImpl.java | 2 +- .../invoke/AbstractODataInvokeRequest.java | 4 +- .../request/retrieve/ODataDeltaRequestImpl.java | 2 +- .../retrieve/ODataEntityRequestImpl.java | 2 +- .../retrieve/ODataEntitySetRequestImpl.java | 2 +- .../retrieve/ODataPropertyRequestImpl.java | 2 +- .../request/retrieve/ODataRawRequestImpl.java | 2 +- .../ODataServiceDocumentRequestImpl.java | 2 +- .../ODataMediaEntityCreateRequestImpl.java | 2 +- .../ODataMediaEntityUpdateRequestImpl.java | 2 +- .../data/JSONServiceDocumentDeserializer.java | 4 +- .../data/XMLServiceDocumentDeserializer.java | 4 +- .../core/serialization/AbstractAtomDealer.java | 97 +++ .../core/serialization/AtomDeserializer.java | 873 +++++++++++++++++++ .../serialization/AtomGeoValueDeserializer.java | 269 ++++++ .../serialization/AtomGeoValueSerializer.java | 223 +++++ .../core/serialization/AtomSerializer.java | 570 ++++++++++++ .../ClientODataDeserializerImpl.java | 7 +- .../core/serialization/ContextURLParser.java | 118 +++ .../serialization/JsonDeltaDeserializer.java | 100 +++ .../core/serialization/JsonDeserializer.java | 421 +++++++++ .../serialization/JsonEntityDeserializer.java | 229 +++++ .../serialization/JsonEntitySerializer.java | 135 +++ .../JsonEntitySetDeserializer.java | 120 +++ .../serialization/JsonEntitySetSerializer.java | 92 ++ .../serialization/JsonGeoValueDeserializer.java | 262 ++++++ .../serialization/JsonGeoValueSerializer.java | 184 ++++ .../JsonODataErrorDeserializer.java | 87 ++ .../JsonODataErrorDetailDeserializer.java | 58 ++ .../serialization/JsonPropertyDeserializer.java | 114 +++ .../serialization/JsonPropertySerializer.java | 93 ++ .../core/serialization/JsonSerializer.java | 376 ++++++++ .../core/serialization/ODataBinderImpl.java | 3 +- .../core/serialization/ODataReaderImpl.java | 2 +- .../core/serialization/ODataWriterImpl.java | 2 +- .../serialization/AtomDeserializerTest.java | 329 +++++++ .../serialization/ContextURLParserTest.java | 256 ++++++ .../olingo/client/core/v4/EntitySetTest.java | 2 +- .../apache/olingo/client/core/v4/ErrorTest.java | 2 +- .../olingo/client/core/v4/PropertyTest.java | 4 +- .../client/core/v4/ServiceDocumentTest.java | 2 +- .../api/serialization/ODataDeserializer.java | 65 -- .../ODataDeserializerException.java | 38 - .../api/serialization/ODataSerializer.java | 33 - .../serialization/ODataSerializerException.java | 38 - .../core/serialization/AbstractAtomDealer.java | 97 --- .../core/serialization/AtomDeserializer.java | 873 ------------------- .../serialization/AtomGeoValueDeserializer.java | 269 ------ .../serialization/AtomGeoValueSerializer.java | 223 ----- .../core/serialization/AtomSerializer.java | 570 ------------ .../core/serialization/ContextURLParser.java | 118 --- .../serialization/JsonDeltaDeserializer.java | 100 --- .../core/serialization/JsonDeserializer.java | 421 --------- .../serialization/JsonEntityDeserializer.java | 229 ----- .../serialization/JsonEntitySerializer.java | 135 --- .../JsonEntitySetDeserializer.java | 120 --- .../serialization/JsonEntitySetSerializer.java | 92 -- .../serialization/JsonGeoValueDeserializer.java | 262 ------ .../serialization/JsonGeoValueSerializer.java | 184 ---- .../JsonODataErrorDeserializer.java | 87 -- .../JsonODataErrorDetailDeserializer.java | 58 -- .../serialization/JsonPropertyDeserializer.java | 114 --- .../serialization/JsonPropertySerializer.java | 93 -- .../core/serialization/JsonSerializer.java | 376 -------- .../serialization/AtomDeserializerTest.java | 328 ------- .../serialization/ContextURLParserTest.java | 255 ------ 86 files changed, 5240 insertions(+), 5246 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/fit/pom.xml ---------------------------------------------------------------------- diff --git a/fit/pom.xml b/fit/pom.xml index b35d5ae..de9743d 100644 --- a/fit/pom.xml +++ b/fit/pom.xml @@ -43,6 +43,12 @@ <dependency> <groupId>org.apache.olingo</groupId> + <artifactId>odata-client-core</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.apache.olingo</groupId> <artifactId>odata-client-proxy</artifactId> <version>${project.version}</version> </dependency> @@ -118,12 +124,6 @@ <dependency> <groupId>org.apache.olingo</groupId> - <artifactId>odata-client-core</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.olingo</groupId> <artifactId>odata-server-tecsvc</artifactId> <version>${project.version}</version> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java index a5ca333..690e004 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -68,6 +68,11 @@ import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.Multipart; import org.apache.cxf.jaxrs.ext.multipart.MultipartBody; +import org.apache.olingo.client.api.serialization.ODataDeserializer; +import org.apache.olingo.client.api.serialization.ODataSerializer; +import org.apache.olingo.client.core.serialization.AtomSerializer; +import org.apache.olingo.client.core.serialization.JsonDeserializer; +import org.apache.olingo.client.core.serialization.JsonSerializer; import org.apache.olingo.commons.api.data.ComplexValue; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; @@ -79,12 +84,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.commons.api.serialization.ODataDeserializer; -import org.apache.olingo.commons.api.serialization.ODataSerializer; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.serialization.AtomSerializer; -import org.apache.olingo.commons.core.serialization.JsonDeserializer; -import org.apache.olingo.commons.core.serialization.JsonSerializer; import org.apache.olingo.fit.metadata.EntityType; import org.apache.olingo.fit.metadata.Metadata; import org.apache.olingo.fit.metadata.NavigationProperty; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java b/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java index 8ad62fe..d02475d 100644 --- a/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java +++ b/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java @@ -27,8 +27,8 @@ import java.nio.charset.CodingErrorAction; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamException; +import org.apache.olingo.client.core.serialization.AtomDeserializer; import org.apache.olingo.commons.api.Constants; -import org.apache.olingo.commons.core.serialization.AtomDeserializer; public class FITAtomDeserializer extends AtomDeserializer { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java index 7fa9201..73eae08 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java @@ -42,19 +42,19 @@ import javax.ws.rs.core.Response; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.vfs2.FileObject; +import org.apache.olingo.client.api.serialization.ODataDeserializer; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; +import org.apache.olingo.client.api.serialization.ODataSerializer; +import org.apache.olingo.client.api.serialization.ODataSerializerException; +import org.apache.olingo.client.core.serialization.AtomSerializer; +import org.apache.olingo.client.core.serialization.JsonDeserializer; +import org.apache.olingo.client.core.serialization.JsonSerializer; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Link; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.commons.api.serialization.ODataDeserializer; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.api.serialization.ODataSerializer; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; -import org.apache.olingo.commons.core.serialization.AtomSerializer; -import org.apache.olingo.commons.core.serialization.JsonDeserializer; -import org.apache.olingo.commons.core.serialization.JsonSerializer; import org.apache.olingo.fit.UnsupportedMediaTypeException; import org.apache.olingo.fit.metadata.Metadata; import org.apache.olingo.fit.metadata.NavigationProperty; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java index 02dcadd..0dad1e6 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java @@ -38,12 +38,12 @@ import org.apache.commons.vfs2.FileSystemException; import org.apache.commons.vfs2.FileSystemManager; import org.apache.commons.vfs2.FileType; import org.apache.commons.vfs2.VFS; +import org.apache.olingo.client.api.serialization.ODataSerializerException; +import org.apache.olingo.client.core.serialization.AtomSerializer; +import org.apache.olingo.client.core.serialization.JsonSerializer; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; -import org.apache.olingo.commons.core.serialization.AtomSerializer; -import org.apache.olingo.commons.core.serialization.JsonSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java index 523aedd..58dd2a3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java @@ -33,10 +33,10 @@ import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; +import org.apache.olingo.client.api.serialization.ODataSerializerException; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.apache.olingo.fit.server.TomcatTestServer; import org.apache.olingo.server.tecsvc.TechnicalServlet; import org.junit.BeforeClass; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java index 214ab98..b8d5830 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java @@ -28,6 +28,7 @@ import org.apache.olingo.client.api.communication.request.retrieve.RetrieveReque import org.apache.olingo.client.api.serialization.ClientODataDeserializer; import org.apache.olingo.client.api.serialization.ODataBinder; import org.apache.olingo.client.api.serialization.ODataReader; +import org.apache.olingo.client.api.serialization.ODataSerializer; import org.apache.olingo.client.api.serialization.ODataWriter; import org.apache.olingo.client.api.uri.FilterFactory; import org.apache.olingo.client.api.uri.SearchFactory; @@ -35,7 +36,6 @@ import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.api.domain.ClientObjectFactory; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataSerializer; public interface ODataClient { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java index accfce6..801ef1a 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java @@ -30,11 +30,11 @@ import java.util.NoSuchElementException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.ODataClient; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java index 56c2e13..8317c22 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java @@ -24,8 +24,6 @@ import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.commons.api.data.Delta; import org.apache.olingo.commons.api.data.ResWrap; -import org.apache.olingo.commons.api.serialization.ODataDeserializer; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; public interface ClientODataDeserializer extends ODataDeserializer { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializer.java new file mode 100644 index 0000000..e91ba93 --- /dev/null +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializer.java @@ -0,0 +1,65 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.client.api.serialization; + +import java.io.InputStream; + +import org.apache.olingo.commons.api.ODataError; +import org.apache.olingo.commons.api.data.Entity; +import org.apache.olingo.commons.api.data.EntityCollection; +import org.apache.olingo.commons.api.data.Property; +import org.apache.olingo.commons.api.data.ResWrap; + +/** + * Interface for de-serialization. + */ +public interface ODataDeserializer { + + /** + * Gets an entity set object from the given InputStream. + * + * @param input stream to be de-serialized. + * @return {@link EntityCollection} instance. + */ + ResWrap<EntityCollection> toEntitySet(InputStream input) throws ODataDeserializerException; + + /** + * Gets an entity object from the given InputStream. + * + * @param input stream to be de-serialized. + * @return {@link Entity} instance. + */ + ResWrap<Entity> toEntity(InputStream input) throws ODataDeserializerException; + + /** + * Gets a property object from the given InputStream. + * + * @param input stream to be de-serialized. + * @return Property instance. + */ + ResWrap<Property> toProperty(InputStream input) throws ODataDeserializerException; + + /** + * Gets the ODataError object represented by the given InputStream. + * + * @param input stream to be parsed and de-serialized. + * @return parsed ODataError object represented by the given InputStream + */ + ODataError toError(InputStream input) throws ODataDeserializerException; +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializerException.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializerException.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializerException.java new file mode 100644 index 0000000..c21b8cb --- /dev/null +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataDeserializerException.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.client.api.serialization; + +import org.apache.olingo.commons.api.ODataException; + +public class ODataDeserializerException extends ODataException { + + private static final long serialVersionUID = -3236099963180859670L; + + public ODataDeserializerException(final String msg) { + super(msg); + } + + public ODataDeserializerException(final Throwable cause) { + super(cause); + } + + public ODataDeserializerException(final String msg, final Throwable cause) { + super(msg, cause); + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java index 7e4aa96..4360cd8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java @@ -30,7 +30,6 @@ import org.apache.olingo.client.api.domain.ClientServiceDocument; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.provider.CsdlSchema; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * OData reader. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializer.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializer.java new file mode 100644 index 0000000..6d81981 --- /dev/null +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializer.java @@ -0,0 +1,33 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.client.api.serialization; + +import java.io.Writer; + +import org.apache.olingo.commons.api.data.ResWrap; + +/** + * Interface for serialization. + */ +public interface ODataSerializer { + + public <T> void write(final Writer writer, final T obj) throws ODataSerializerException; + + public <T> void write(final Writer writer, final ResWrap<T> container) throws ODataSerializerException; +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializerException.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializerException.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializerException.java new file mode 100644 index 0000000..b54696e --- /dev/null +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataSerializerException.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.client.api.serialization; + +import org.apache.olingo.commons.api.ODataException; + +public class ODataSerializerException extends ODataException { + + private static final long serialVersionUID = -3236099963180859670L; + + public ODataSerializerException(final String msg) { + super(msg); + } + + public ODataSerializerException(final Throwable cause) { + super(cause); + } + + public ODataSerializerException(final String msg, final Throwable cause) { + super(msg, cause); + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java ---------------------------------------------------------------------- diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java index 5287c94..7b5dc5b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java @@ -27,7 +27,6 @@ import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientLink; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; /** * OData writer. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java index a934e3e..c490dae 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientImpl.java @@ -31,6 +31,7 @@ import org.apache.olingo.client.api.communication.request.retrieve.RetrieveReque import org.apache.olingo.client.api.serialization.ClientODataDeserializer; import org.apache.olingo.client.api.serialization.ODataBinder; import org.apache.olingo.client.api.serialization.ODataReader; +import org.apache.olingo.client.api.serialization.ODataSerializer; import org.apache.olingo.client.api.serialization.ODataWriter; import org.apache.olingo.client.api.uri.FilterFactory; import org.apache.olingo.client.api.uri.SearchFactory; @@ -41,7 +42,9 @@ import org.apache.olingo.client.core.communication.request.batch.BatchRequestFac import org.apache.olingo.client.core.communication.request.cud.CUDRequestFactoryImpl; import org.apache.olingo.client.core.communication.request.invoke.InvokeRequestFactoryImpl; import org.apache.olingo.client.core.communication.request.retrieve.RetrieveRequestFactoryImpl; +import org.apache.olingo.client.core.serialization.AtomSerializer; import org.apache.olingo.client.core.serialization.ClientODataDeserializerImpl; +import org.apache.olingo.client.core.serialization.JsonSerializer; import org.apache.olingo.client.core.serialization.ODataBinderImpl; import org.apache.olingo.client.core.serialization.ODataReaderImpl; import org.apache.olingo.client.core.serialization.ODataWriterImpl; @@ -50,10 +53,7 @@ import org.apache.olingo.client.core.uri.URIBuilderImpl; import org.apache.olingo.client.api.domain.ClientObjectFactory; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataSerializer; import org.apache.olingo.client.core.domain.ClientObjectFactoryImpl; -import org.apache.olingo.commons.core.serialization.AtomSerializer; -import org.apache.olingo.commons.core.serialization.JsonSerializer; public class ODataClientImpl implements ODataClient { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java index 2008149..e359e29 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java @@ -24,10 +24,10 @@ import org.apache.http.StatusLine; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.ODataServerErrorException; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java index b2aba3d..424ff8f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java @@ -34,10 +34,10 @@ import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; +import org.apache.olingo.client.api.serialization.ODataSerializerException; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; /** * This class implements an OData create request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java index 195eaeb..44ff471 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java @@ -35,10 +35,10 @@ import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; +import org.apache.olingo.client.api.serialization.ODataSerializerException; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; /** * This class implements an OData update request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java index a88652f..33ec73a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java @@ -34,10 +34,10 @@ import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientProperty; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; +import org.apache.olingo.client.api.serialization.ODataSerializerException; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; /** * This class implements an OData update entity property request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java index 477a91a..933f223 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataReferenceAddingRequestImpl.java @@ -28,6 +28,7 @@ import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.cud.ODataReferenceAddingRequest; import org.apache.olingo.client.api.communication.response.ODataReferenceAddingResponse; +import org.apache.olingo.client.api.serialization.ODataSerializerException; import org.apache.olingo.client.api.serialization.ODataWriter; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; @@ -35,7 +36,6 @@ import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; /** * See {@link ODataReferenceAddingRequest} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java index 5bd259c..29ad66e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java @@ -35,6 +35,8 @@ import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequ import org.apache.olingo.client.api.communication.request.invoke.ClientNoContent; import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; import org.apache.olingo.client.api.http.HttpClientException; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; +import org.apache.olingo.client.api.serialization.ODataSerializerException; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; import org.apache.olingo.client.core.uri.URIUtils; @@ -45,8 +47,6 @@ import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientValue; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.api.serialization.ODataSerializerException; /** * This class implements an OData invoke operation request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java index 601e4ba..5eb4d84 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataDeltaRequestImpl.java @@ -27,11 +27,11 @@ import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataDeltaRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.http.HttpClientException; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.data.Delta; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientDelta; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest<ClientDelta> implements ODataDeltaRequest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java index 57acf2a..d5a224f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * This class implements an OData retrieve query request returning a single entity. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java index 620a88d..7e0164b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientEntitySet; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * This class implements an OData EntitySet query request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java index 36e9d0c..b5a3d10 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java @@ -27,11 +27,11 @@ import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.http.HttpClientException; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * This class implements an OData entity property query request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java index 4c22c31..c29e7ee 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java @@ -28,12 +28,12 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; import org.apache.olingo.client.api.communication.response.ODataRawResponse; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.client.core.communication.request.AbstractODataRequest; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * This class implements a generic OData request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java index 363ba87..b4888f4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientServiceDocument; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * This class implements an OData service document request. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java index 175258b..1443f88 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java @@ -33,8 +33,8 @@ import org.apache.olingo.client.core.communication.response.AbstractODataRespons import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * This class implements an OData Media Entity create request. Get instance by using ODataStreamedRequestFactory. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java index d38533e..8c02eca 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java @@ -33,8 +33,8 @@ import org.apache.olingo.client.core.communication.response.AbstractODataRespons import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientEntity; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; /** * This class implements an OData Media Entity create request. Get instance by using ODataStreamedRequestFactory. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java index e5bd7bd..9a95459 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java @@ -25,10 +25,10 @@ import java.util.Iterator; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.data.ServiceDocument; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; +import org.apache.olingo.client.core.serialization.JsonDeserializer; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.ResWrap; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.core.serialization.JsonDeserializer; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java index 0b37722..2e9064c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java @@ -23,10 +23,10 @@ import java.io.InputStream; import java.net.URI; import org.apache.olingo.client.api.data.ServiceDocument; +import org.apache.olingo.client.api.serialization.ODataDeserializerException; +import org.apache.olingo.client.core.serialization.JsonDeserializer; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.ResWrap; -import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.core.serialization.JsonDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/20351253/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractAtomDealer.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractAtomDealer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractAtomDealer.java new file mode 100644 index 0000000..242ef31 --- /dev/null +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractAtomDealer.java @@ -0,0 +1,97 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.client.core.serialization; + +import javax.xml.XMLConstants; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; + +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.Constants; + +abstract class AbstractAtomDealer { + + protected static final String TYPE_TEXT = "text"; + + protected final String namespaceMetadata; + protected final String namespaceData; + + protected final QName etagQName; + protected final QName metadataEtagQName; + protected final QName inlineQName; + protected final QName actionQName; + protected final QName propertiesQName; + protected final QName typeQName; + protected final QName nullQName; + protected final QName elementQName; + protected final QName countQName; + protected final QName uriQName; + protected final QName nextQName; + protected final QName annotationQName; + protected final QName contextQName; + protected final QName entryRefQName; + protected final QName propertyValueQName; + protected final QName deletedEntryQName; + protected final QName reasonQName; + protected final QName linkQName; + protected final QName deletedLinkQName; + protected final QName errorCodeQName; + protected final QName errorMessageQName; + protected final QName errorTargetQName; + + public AbstractAtomDealer() { + namespaceMetadata = Constants.NS_METADATA; + namespaceData = Constants.NS_DATASERVICES; + + etagQName = new QName(namespaceMetadata, Constants.ATOM_ATTR_ETAG); + metadataEtagQName = new QName(namespaceMetadata, Constants.ATOM_ATTR_METADATAETAG); + inlineQName = new QName(namespaceMetadata, Constants.ATOM_ELEM_INLINE); + actionQName = new QName(namespaceMetadata, Constants.ATOM_ELEM_ACTION); + propertiesQName = new QName(namespaceMetadata, Constants.PROPERTIES); + typeQName = new QName(namespaceMetadata, Constants.ATTR_TYPE); + nullQName = new QName(namespaceMetadata, Constants.ATTR_NULL); + elementQName = new QName(namespaceMetadata, Constants.ELEM_ELEMENT); + countQName = new QName(namespaceMetadata, Constants.ATOM_ELEM_COUNT); + uriQName = new QName(namespaceData, Constants.ELEM_URI); + nextQName = new QName(namespaceData, Constants.NEXT_LINK_REL); + annotationQName = new QName(namespaceMetadata, Constants.ANNOTATION); + contextQName = new QName(namespaceMetadata, Constants.CONTEXT); + entryRefQName = new QName(namespaceMetadata, Constants.ATOM_ELEM_ENTRY_REF); + propertyValueQName = new QName(namespaceMetadata, Constants.VALUE); + + deletedEntryQName = new QName(Constants.NS_ATOM_TOMBSTONE, Constants.ATOM_ELEM_DELETED_ENTRY); + reasonQName = new QName(namespaceMetadata, Constants.ELEM_REASON); + linkQName = new QName(namespaceMetadata, Constants.ATOM_ELEM_LINK); + deletedLinkQName = new QName(namespaceMetadata, Constants.ELEM_DELETED_LINK); + + errorCodeQName = new QName(namespaceMetadata, Constants.ERROR_CODE); + errorMessageQName = new QName(namespaceMetadata, Constants.ERROR_MESSAGE); + errorTargetQName = new QName(namespaceMetadata, Constants.ERROR_TARGET); + } + + protected void namespaces(final XMLStreamWriter writer) throws XMLStreamException { + writer.writeNamespace(StringUtils.EMPTY, Constants.NS_ATOM); + writer.writeNamespace(XMLConstants.XML_NS_PREFIX, XMLConstants.XML_NS_URI); + writer.writeNamespace(Constants.PREFIX_METADATA, Constants.NS_METADATA); + writer.writeNamespace(Constants.PREFIX_DATASERVICES, Constants.NS_DATASERVICES); + writer.writeNamespace(Constants.PREFIX_GML, Constants.NS_GML); + writer.writeNamespace(Constants.PREFIX_GEORSS, Constants.NS_GEORSS); + } +}
