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/06/17 17:55:33 UTC
[09/10] olingo-odata4 git commit: [OLINGO-704] Class ODataFormat
removed
[OLINGO-704] Class ODataFormat removed
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/588df780
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/588df780
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/588df780
Branch: refs/heads/IEE754Compatible
Commit: 588df780bf1eb5e0860f48d55e7863a11e238c5e
Parents: be55285
Author: Christian Holzer <c....@sap.com>
Authored: Fri Jun 12 18:01:35 2015 +0200
Committer: Christian Holzer <c....@sap.com>
Committed: Wed Jun 17 17:48:16 2015 +0200
----------------------------------------------------------------------
.../olingo/ext/proxy/AbstractService.java | 4 +-
.../EntityContainerInvocationHandler.java | 1 +
.../proxy/commons/EntityInvocationHandler.java | 6 +-
.../commons/EntitySetInvocationHandler.java | 6 +-
.../olingo/ext/pojogen/AbstractPOJOGenMojo.java | 4 +-
.../olingo/fit/AbstractBaseTestITCase.java | 11 +-
.../fit/tecsvc/client/ActionImportITCase.java | 4 +-
.../olingo/fit/tecsvc/client/BasicITCase.java | 9 +-
.../fit/tecsvc/client/BatchClientITCase.java | 23 ++--
.../olingo/fit/tecsvc/client/BindingITCase.java | 6 +-
.../fit/tecsvc/client/ConditionalITCase.java | 4 +-
.../fit/tecsvc/client/DeepInsertITCase.java | 6 +-
.../tecsvc/client/EntityReferencesITCase.java | 4 +-
.../ExpandWithSystemQueryOptionsITCase.java | 4 +-
.../tecsvc/client/FilterSystemQueryITCase.java | 4 +-
.../fit/tecsvc/client/FunctionImportITCase.java | 4 +-
.../olingo/fit/tecsvc/client/MediaITCase.java | 3 +-
.../fit/tecsvc/client/NavigationITCase.java | 4 +-
.../tecsvc/client/OrderBySystemQueryITCase.java | 4 +-
.../tecsvc/client/PrimitiveComplexITCase.java | 3 +-
.../tecsvc/client/SystemQueryOptionITCase.java | 4 +-
.../olingo/fit/v4/AbstractTestITCase.java | 17 ++-
.../apache/olingo/fit/v4/AsyncTestITCase.java | 20 +--
.../olingo/fit/v4/AuthBatchTestITCase.java | 5 +-
.../apache/olingo/fit/v4/BatchTestITCase.java | 21 ++--
.../fit/v4/BoundOperationInvokeTestITCase.java | 52 ++++----
.../olingo/fit/v4/ConformanceTestITCase.java | 30 ++---
.../apache/olingo/fit/v4/DeltaTestITCase.java | 8 +-
.../olingo/fit/v4/DerivedTypeTestITCase.java | 22 ++--
.../olingo/fit/v4/EntityCreateTestITCase.java | 26 ++--
.../olingo/fit/v4/EntityRetrieveTestITCase.java | 88 ++++++-------
.../olingo/fit/v4/EntitySetTestITCase.java | 38 +++---
.../olingo/fit/v4/EntityUpdateTestITCase.java | 32 ++---
.../olingo/fit/v4/ErrorResponseTestITCase.java | 4 +-
.../olingo/fit/v4/FilterFactoryTestITCase.java | 4 +-
.../fit/v4/JSONFormatConformanceTestITCase.java | 12 +-
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 24 ++--
.../olingo/fit/v4/MediaEntityTestITCase.java | 28 ++---
.../apache/olingo/fit/v4/OAuth2TestITCase.java | 14 +--
.../olingo/fit/v4/OpenTypeTestITCase.java | 26 ++--
.../fit/v4/OperationImportInvokeTestITCase.java | 38 +++---
.../olingo/fit/v4/PropertyTestITCase.java | 42 +++----
.../olingo/fit/v4/PropertyValueTestITCase.java | 22 ++--
.../olingo/fit/v4/QueryOptionsTestITCase.java | 6 +-
.../fit/v4/ServiceDocumentTestITCase.java | 10 +-
.../olingo/fit/v4/SingletonTestITCase.java | 30 ++---
.../apache/olingo/client/api/Configuration.java | 17 ++-
.../apache/olingo/client/api/ODataClient.java | 8 +-
.../olingo/client/api/ODataClientBuilder.java | 8 +-
.../request/ODataBasicRequest.java | 8 +-
.../streamed/ODataStreamedEntityRequest.java | 7 +-
.../api/domain/ClientEntitySetIterator.java | 21 ++--
.../client/api/serialization/ODataReader.java | 27 ++--
.../client/api/serialization/ODataWriter.java | 26 ++--
.../olingo/client/core/ConfigurationImpl.java | 31 +++--
.../olingo/client/core/ODataClientFactory.java | 4 +-
.../olingo/client/core/ODataClientImpl.java | 17 +--
.../header/ODataErrorResponseChecker.java | 8 +-
.../request/AbstractODataBasicRequest.java | 8 +-
.../request/AbstractODataRequest.java | 8 +-
.../request/cud/ODataDeleteRequestImpl.java | 4 +-
.../cud/ODataEntityCreateRequestImpl.java | 10 +-
.../cud/ODataEntityUpdateRequestImpl.java | 10 +-
.../cud/ODataPropertyUpdateRequestImpl.java | 10 +-
.../cud/ODataReferenceAddingRequestImpl.java | 6 +-
.../cud/ODataValueUpdateRequestImpl.java | 13 +-
.../invoke/AbstractODataInvokeRequest.java | 37 +++---
.../request/invoke/ODataInvokeRequestImpl.java | 14 +--
.../retrieve/AbstractMetadataRequestImpl.java | 5 +-
.../request/retrieve/ODataDeltaRequestImpl.java | 8 +-
.../retrieve/ODataEntityRequestImpl.java | 8 +-
.../ODataEntitySetIteratorRequestImpl.java | 8 +-
.../retrieve/ODataEntitySetRequestImpl.java | 8 +-
.../request/retrieve/ODataMediaRequestImpl.java | 8 +-
.../retrieve/ODataPropertyRequestImpl.java | 8 +-
.../request/retrieve/ODataRawRequestImpl.java | 4 +-
.../ODataServiceDocumentRequestImpl.java | 8 +-
.../request/retrieve/ODataValueRequestImpl.java | 11 +-
.../retrieve/XMLMetadataRequestImpl.java | 4 +-
.../AbstractODataStreamedEntityRequest.java | 16 +--
.../streamed/AbstractODataStreamedRequest.java | 3 +-
.../ClientODataDeserializerImpl.java | 19 +--
.../core/serialization/ODataBinderImpl.java | 54 ++++----
.../core/serialization/ODataReaderImpl.java | 50 ++++----
.../core/serialization/ODataWriterImpl.java | 28 ++---
.../apache/olingo/client/core/AbstractTest.java | 8 +-
.../apache/olingo/client/core/v4/AtomTest.java | 22 ++--
.../olingo/client/core/v4/EntitySetTest.java | 42 +++----
.../olingo/client/core/v4/EntityTest.java | 105 ++++++++--------
.../apache/olingo/client/core/v4/ErrorTest.java | 22 ++--
.../apache/olingo/client/core/v4/JSONTest.java | 52 ++++----
.../olingo/client/core/v4/MetadataTest.java | 14 +--
.../olingo/client/core/v4/PropertyTest.java | 59 ++++-----
.../client/core/v4/ServiceDocumentTest.java | 35 +++---
.../olingo/commons/api/format/AcceptType.java | 6 +-
.../olingo/commons/api/format/ContentType.java | 65 ++++++++--
.../olingo/commons/api/format/Format.java | 41 ++++++
.../olingo/commons/api/format/ODataFormat.java | 126 -------------------
.../commons/api/format/AcceptTypeTest.java | 6 +-
.../serialization/JsonEntitySerializer.java | 12 +-
.../core/serialization/JsonSerializer.java | 16 +--
.../org/apache/olingo/server/api/OData.java | 2 +-
.../apache/olingo/server/core/ErrorHandler.java | 5 +-
.../olingo/server/core/ServiceRequest.java | 8 +-
.../olingo/server/example/TripPinDataModel.java | 4 +-
.../olingo/server/core/ContentNegotiator.java | 20 +--
.../apache/olingo/server/core/ODataHandler.java | 3 +-
.../apache/olingo/server/core/ODataImpl.java | 6 +-
.../serializer/json/ODataJsonSerializer.java | 14 +--
.../json/ServiceDocumentJsonSerializer.java | 11 +-
.../olingo/server/core/uri/parser/Parser.java | 8 +-
.../server/core/ContentNegotiatorTest.java | 3 +-
.../json/ODataJsonDeserializerBasicTest.java | 26 ++--
.../json/ODataJsonSerializerTest.java | 4 +-
.../json/ServerErrorSerializerTest.java | 6 +-
.../xml/MetadataDocumentXmlSerializerTest.java | 4 +-
.../processor/TechnicalActionProcessor.java | 12 +-
.../processor/TechnicalEntityProcessor.java | 6 +-
.../TechnicalPrimitiveComplexProcessor.java | 4 +-
.../olingo/server/core/ODataHandlerTest.java | 5 +-
.../json/AbstractODataDeserializerTest.java | 3 +-
.../json/ODataJsonSerializerTest.java | 7 +-
.../serializer/json/ServiceDocumentTest.java | 4 +-
.../serializer/xml/MetadataDocumentTest.java | 4 +-
.../server/sample/processor/CarsProcessor.java | 11 +-
125 files changed, 1027 insertions(+), 1073 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
index f8506c2..0fd8c46 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/AbstractService.java
@@ -34,7 +34,7 @@ import org.apache.olingo.client.core.edm.ClientCsdlEdmProvider;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.core.edm.EdmProviderImpl;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
@@ -96,7 +96,7 @@ public abstract class AbstractService<C extends EdmEnabledODataClient> {
}
this.client = ODataClientFactory.getEdmEnabledClient(serviceRoot, edm, metadataETag);
- this.client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON_FULL_METADATA);
+ this.client.getConfiguration().setDefaultPubFormat(ContentType.JSON_FULL_METADATA);
this.transactional = transactional;
this.context = new Context();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
index b31e624..f3f1b4d 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java
@@ -24,6 +24,7 @@ import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.URI;
+
import org.apache.commons.lang3.ArrayUtils;
import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
index 66bc66c..c124402 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java
@@ -33,12 +33,12 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
-import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.domain.ClientAnnotation;
import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientProperty;
+import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.Annotatable;
@@ -335,7 +335,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
getClient().getRetrieveRequestFactory().getMediaEntityRequest(contentSource);
if (StringUtils.isNotBlank(getEntity().getMediaContentType())) {
- retrieveReq.setFormat(ODataFormat.fromString(getEntity().getMediaContentType()));
+ retrieveReq.setFormat(ContentType.parse(getEntity().getMediaContentType()));
}
final ODataRetrieveResponse<InputStream> res = retrieveReq.execute();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
index 6c8d35f..8250f72 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
@@ -29,11 +29,11 @@ import java.util.concurrent.Future;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest;
-import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.domain.ClientAnnotation;
import org.apache.olingo.client.api.domain.ClientEntity;
+import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -95,7 +95,7 @@ public class EntitySetInvocationHandler<
public Long count() {
final ODataValueRequest req = getClient().getRetrieveRequestFactory().
getValueRequest(getClient().newURIBuilder(this.uri.build().toASCIIString()).count().build());
- req.setFormat(ODataFormat.TEXT_PLAIN);
+ req.setFormat(ContentType.TEXT_PLAIN);
return Long.valueOf(req.execute().getBody().asPrimitive().toString());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
index 9321c64..295d1c2 100644
--- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
+++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
@@ -55,7 +55,7 @@ import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmEnumType;
import org.apache.olingo.commons.api.edm.EdmSchema;
import org.apache.olingo.commons.api.edm.EdmTerm;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
@@ -218,7 +218,7 @@ public abstract class AbstractPOJOGenMojo extends AbstractMojo {
} else if (StringUtils.isNotEmpty(localEdm)) {
final FileInputStream fis = new FileInputStream(FileUtils.getFile(localEdm));
try {
- metadata = getClient().getDeserializer(ODataFormat.XML).toMetadata(fis);
+ metadata = getClient().getDeserializer(ContentType.APPLICATION_XML).toMetadata(fis);
edm = getClient().getReader().readMetadata(metadata.getSchemaByNsOrAlias());
} finally {
IOUtils.closeQuietly(fis);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/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..a838390 100644
--- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
@@ -35,7 +35,7 @@ import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientValue;
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.format.ContentType;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import org.apache.olingo.fit.server.TomcatTestServer;
import org.apache.olingo.server.tecsvc.TechnicalServlet;
@@ -72,7 +72,7 @@ public abstract class AbstractBaseTestITCase {
if (LOG.isDebugEnabled()) {
final StringWriter writer = new StringWriter();
try {
- getClient().getSerializer(ODataFormat.JSON).write(writer, entity);
+ getClient().getSerializer(ContentType.JSON).write(writer, entity);
} catch (final ODataSerializerException e) {
// Debug
}
@@ -85,7 +85,7 @@ public abstract class AbstractBaseTestITCase {
if (LOG.isDebugEnabled()) {
final StringWriter writer = new StringWriter();
try {
- getClient().getSerializer(ODataFormat.JSON).write(writer, entitySet);
+ getClient().getSerializer(ContentType.JSON).write(writer, entitySet);
} catch (final ODataSerializerException e) {
// Debug
}
@@ -106,7 +106,8 @@ public abstract class AbstractBaseTestITCase {
if (LOG.isDebugEnabled()) {
StringWriter writer = new StringWriter();
try {
- getClient().getSerializer(ODataFormat.ATOM).write(writer, getClient().getBinder().getEntity(entity));
+ getClient().getSerializer(ContentType.APPLICATION_ATOM_XML).write(writer, getClient().getBinder()
+ .getEntity(entity));
} catch (final ODataSerializerException e) {
// Debug
}
@@ -115,7 +116,7 @@ public abstract class AbstractBaseTestITCase {
writer = new StringWriter();
try {
- getClient().getSerializer(ODataFormat.JSON).write(writer, getClient().getBinder().getEntity(entity));
+ getClient().getSerializer(ContentType.JSON).write(writer, getClient().getBinder().getEntity(entity));
} catch (final ODataSerializerException e) {
// Debug
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java
index 0c40003..8661af4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ActionImportITCase.java
@@ -41,7 +41,7 @@ import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
import org.junit.Test;
@@ -298,7 +298,7 @@ public class ActionImportITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON_NO_METADATA);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON_NO_METADATA);
return odata;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
index 936569e..fc0a32e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
@@ -72,7 +72,6 @@ import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -421,7 +420,7 @@ public class BasicITCase extends AbstractBaseTestITCase {
@Test
public void readEntityWithExpandedNavigationProperty() {
final ODataClient client = ODataClientFactory.getEdmEnabledClient(SERVICE_URI);
- client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ client.getConfiguration().setDefaultPubFormat(ContentType.JSON);
final URI uri = client.newURIBuilder(SERVICE_URI)
.appendEntitySetSegment("ESKeyNav")
@@ -938,7 +937,7 @@ public class BasicITCase extends AbstractBaseTestITCase {
@Test
public void createEntityWithIEEE754CompatibleParameter() {
final ODataClient client = ODataClientFactory.getEdmEnabledClient(SERVICE_URI);
- client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ client.getConfiguration().setDefaultPubFormat(ContentType.JSON);
final ClientObjectFactory of = client.getObjectFactory();
final URI uri = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_ALL_PRIM).build();
final URI linkURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_TWO_PRIM)
@@ -965,7 +964,7 @@ public class BasicITCase extends AbstractBaseTestITCase {
@Test
public void createEntityInt64AndDecimalAsStringWithoutIEEE754ComaptibleParameter() {
final ODataClient client = ODataClientFactory.getEdmEnabledClient(SERVICE_URI);
- client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ client.getConfiguration().setDefaultPubFormat(ContentType.JSON);
final ClientObjectFactory of = client.getObjectFactory();
final URI uri = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_ALL_PRIM).build();
final URI linkURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_TWO_PRIM)
@@ -1104,7 +1103,7 @@ public class BasicITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
index 72a4ef3..ef80126 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
@@ -51,7 +51,6 @@ import org.apache.olingo.client.core.communication.request.batch.ODataChangesetR
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
@@ -123,7 +122,7 @@ public class BatchClientITCase extends AbstractTestITCase {
assertTrue(changeSetResponse.isBreaking());
assertEquals(HttpStatusCode.NOT_FOUND.getStatusCode(), updateResponse.getStatusCode());
- assertEquals(ODataFormat.JSON.toString(), updateResponse.getContentType());
+ assertEquals(ContentType.JSON.toContentTypeString(), updateResponse.getContentType());
}
@Test
@@ -258,7 +257,7 @@ public class BatchClientITCase extends AbstractTestITCase {
final BatchManager payload = request.payloadManager();
final URI uri = new URI(SERVICE_URI + "/../ESAllPrim(32767)");
final ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(uri);
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
payload.addRequest(queryReq);
// Fetch result
@@ -283,7 +282,7 @@ public class BatchClientITCase extends AbstractTestITCase {
final BatchManager payload = request.payloadManager();
final URI uri = new URI("http://otherhost/odata/ESAllPrim(32767)");
final ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(uri);
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
payload.addRequest(queryReq);
// Fetch result
@@ -298,7 +297,7 @@ public class BatchClientITCase extends AbstractTestITCase {
final BatchManager payload = request.payloadManager();
final URI uri = new URI("/ESAllPrim(32767)");
final ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(uri);
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
payload.addRequest(queryReq);
// Fetch result
@@ -389,7 +388,7 @@ public class BatchClientITCase extends AbstractTestITCase {
// add create request
final ODataEntityCreateRequest<ClientEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), entityESAllPrim);
- createReq.setFormat(ODataFormat.JSON);
+ createReq.setFormat(ContentType.JSON);
changeset.addRequest(createReq);
// retrieve request reference
@@ -403,7 +402,7 @@ public class BatchClientITCase extends AbstractTestITCase {
final ODataEntityUpdateRequest<ClientEntity> updateReq = client.getCUDRequestFactory().getEntityUpdateRequest(
URI.create("$" + createRequestRef), UpdateType.PATCH, entityUpdate);
- updateReq.setFormat(ODataFormat.JSON);
+ updateReq.setFormat(ContentType.JSON);
changeset.addRequest(updateReq);
@@ -429,7 +428,7 @@ public class BatchClientITCase extends AbstractTestITCase {
final ODataEntitySetRequest<ClientEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
new URI(createResponse.getHeader(HttpHeader.LOCATION).iterator().next() + "/NavPropertyETTwoPrimMany"));
- req.setFormat(ODataFormat.JSON);
+ req.setFormat(ContentType.JSON);
req.addCustomHeader(HttpHeader.COOKIE, cookie);
final ODataRetrieveResponse<ClientEntitySet> getResponse = req.execute();
@@ -478,7 +477,7 @@ public class BatchClientITCase extends AbstractTestITCase {
final ODataEntityCreateRequest<ClientEntity> createRequest =
client.getCUDRequestFactory().getEntityCreateRequest(editLink, postEntity);
- createRequest.setFormat(ODataFormat.JSON);
+ createRequest.setFormat(ContentType.JSON);
changeset.addRequest(createRequest);
@@ -497,7 +496,7 @@ public class BatchClientITCase extends AbstractTestITCase {
ODataEntityUpdateRequest<ClientEntity> changeReq =
client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patchEntity);
- changeReq.setFormat(ODataFormat.JSON);
+ changeReq.setFormat(ContentType.JSON);
changeset.addRequest(changeReq);
// ------------------------
@@ -518,7 +517,7 @@ public class BatchClientITCase extends AbstractTestITCase {
.build()));
changeReq = client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patchEntity);
- changeReq.setFormat(ODataFormat.JSON);
+ changeReq.setFormat(ContentType.JSON);
changeset.addRequest(changeReq);
// -----------------------------
@@ -594,7 +593,7 @@ public class BatchClientITCase extends AbstractTestITCase {
final URI uri = (isRelative) ? new URI(SERVICE_URI).relativize(targetURI.build()) : targetURI.build();
ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(uri);
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
manager.addRequest(queryReq);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java
index 48c4a00..9be4cc8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BindingITCase.java
@@ -43,7 +43,7 @@ import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -324,7 +324,7 @@ public class BindingITCase extends AbstractBaseTestITCase {
@Test
public void testDeepInsertWithBindingSameNavigationProperty() {
final EdmEnabledODataClient client = ODataClientFactory.getEdmEnabledClient(SERVICE_URI);
- client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ client.getConfiguration().setDefaultPubFormat(ContentType.JSON);
final ClientObjectFactory of = client.getObjectFactory();
final ClientEntity entity = of.newEntity(ET_KEY_NAV);
@@ -392,7 +392,7 @@ public class BindingITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ConditionalITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ConditionalITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ConditionalITCase.java
index 9f5efc3..e5ebd40 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ConditionalITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ConditionalITCase.java
@@ -51,7 +51,7 @@ import org.apache.olingo.client.api.domain.ClientServiceDocument;
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -251,7 +251,7 @@ public final class ConditionalITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java
index b4b8efe..d1b4a8d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/DeepInsertITCase.java
@@ -51,7 +51,7 @@ import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -91,7 +91,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase {
@Test
public void testDeepInsertExpandedResponse() {
final ODataClient client = ODataClientFactory.getEdmEnabledClient(SERVICE_URI);
- client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ client.getConfiguration().setDefaultPubFormat(ContentType.JSON);
final URI createURI = client.newURIBuilder(SERVICE_URI).appendEntitySetSegment(ES_KEY_NAV).build();
final ClientObjectFactory of = client.getObjectFactory();
final ClientEntity entity = of.newEntity(ET_KEY_NAV);
@@ -900,7 +900,7 @@ public class DeepInsertITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/EntityReferencesITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/EntityReferencesITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/EntityReferencesITCase.java
index e6c2bcf..3e3377e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/EntityReferencesITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/EntityReferencesITCase.java
@@ -39,7 +39,7 @@ import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -1002,7 +1002,7 @@ public class EntityReferencesITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
final EdmEnabledODataClient client = ODataClientFactory.getEdmEnabledClient(SERVICE_URI);
- client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ client.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return client;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java
index 7516e4d..75cdecf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/ExpandWithSystemQueryOptionsITCase.java
@@ -35,7 +35,7 @@ import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -471,7 +471,7 @@ public class ExpandWithSystemQueryOptionsITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
EdmEnabledODataClient odata = ODataClientFactory.getEdmEnabledClient(SERVICE_URI);
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java
index 1e27357..8bfd70c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FilterSystemQueryITCase.java
@@ -34,7 +34,7 @@ import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.api.domain.ClientObjectFactory;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -1008,7 +1008,7 @@ public class FilterSystemQueryITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
index 5632bda..f2ea75e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
@@ -39,7 +39,7 @@ import org.apache.olingo.client.api.domain.ClientPrimitiveValue;
import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
@@ -223,7 +223,7 @@ public class FunctionImportITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
index 3bd14c1..e5952a1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
@@ -43,7 +43,6 @@ import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -156,7 +155,7 @@ public final class MediaITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java
index e20d44e..e8147a4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java
@@ -27,7 +27,7 @@ import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
@@ -135,7 +135,7 @@ public final class NavigationITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java
index aa91ed9..f576afa 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/OrderBySystemQueryITCase.java
@@ -30,7 +30,7 @@ import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.api.domain.ClientValuable;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
@@ -164,7 +164,7 @@ public class OrderBySystemQueryITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java
index 1dbd0e6..8550969 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java
@@ -50,7 +50,6 @@ import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.domain.ClientValue;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
@@ -405,7 +404,7 @@ public class PrimitiveComplexITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType.JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java
index bbd9d51..a117d08 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/SystemQueryOptionITCase.java
@@ -29,7 +29,7 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse
import org.apache.olingo.client.api.domain.ClientEntity;
import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.fit.tecsvc.TecSvcConst;
@@ -296,7 +296,7 @@ public class SystemQueryOptionITCase extends AbstractBaseTestITCase {
@Override
protected ODataClient getClient() {
ODataClient odata = ODataClientFactory.getClient();
- odata.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
+ odata.getConfiguration().setDefaultPubFormat(ContentType .JSON);
return odata;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index 5339bff..6f16450 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -46,7 +46,6 @@ import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.junit.BeforeClass;
@@ -97,23 +96,23 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
return client;
}
- protected ClientEntity read(final ODataFormat format, final URI editLink) {
+ protected ClientEntity read(final ContentType contentType, final URI editLink) {
final ODataEntityRequest<ClientEntity> req = getClient().getRetrieveRequestFactory().getEntityRequest(editLink);
- req.setFormat(format);
+ req.setFormat(contentType);
final ODataRetrieveResponse<ClientEntity> res = req.execute();
final ClientEntity entity = res.getBody();
assertNotNull(entity);
- if (ODataFormat.JSON_FULL_METADATA == format || ODataFormat.ATOM == format) {
+ if (ContentType.JSON_FULL_METADATA == contentType || ContentType.APPLICATION_ATOM_XML == contentType) {
assertEquals(req.getURI(), entity.getEditLink());
}
return entity;
}
- protected void createAndDeleteOrder(final String serviceRoot, final ODataFormat format, final int id) {
+ protected void createAndDeleteOrder(final String serviceRoot, final ContentType contentType, final int id) {
final ClientEntity order = getClient().getObjectFactory().newEntity(
new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Order"));
@@ -147,19 +146,19 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
final ODataEntityCreateRequest<ClientEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
getClient().newURIBuilder(serviceRoot).
appendEntitySetSegment("Orders").build(), order);
- req.setFormat(format);
+ req.setFormat(contentType);
final ClientEntity created = req.execute().getBody();
assertNotNull(created);
assertEquals(2, created.getProperty("OrderShelfLifes").getCollectionValue().size());
- if (format == ODataFormat.JSON_NO_METADATA) {
+ if (contentType.equals(ContentType.JSON_NO_METADATA)) {
assertEquals(0, created.getNavigationLinks().size());
assertNull(created.getEditLink());
- } else if (format == ODataFormat.JSON_FULL_METADATA) {
+ } else if (contentType.equals(ContentType.JSON_FULL_METADATA)) {
assertEquals(3, created.getNavigationLinks().size());
assertThat(created.getTypeName().getNamespace(), is("Microsoft.Test.OData.Services.ODataWCFService"));
assertThat(created.getEditLink().toASCIIString(), startsWith("http://localhost:9080/stub/StaticService"));
- } else if (format == ODataFormat.JSON || format == ODataFormat.APPLICATION_JSON) {
+ } else if (contentType.equals(ContentType.JSON) || contentType.equals(ContentType.APPLICATION_JSON)) {
assertEquals(0, created.getNavigationLinks().size());
assertNull(created.getEditLink());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
index ded0d97..a9436b1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
@@ -39,7 +39,7 @@ import org.apache.olingo.client.api.domain.ClientInlineEntity;
import org.apache.olingo.client.api.domain.ClientLink;
import org.apache.olingo.client.api.domain.ClientProperty;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.junit.Test;
public class AsyncTestITCase extends AbstractTestITCase {
@@ -62,13 +62,13 @@ public class AsyncTestITCase extends AbstractTestITCase {
assertFalse(res.getBody().getEntities().isEmpty());
}
- private void withInlineEntry(final ODataFormat format) {
+ private void withInlineEntry(final ContentType contentType) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
final ODataEntityRequest<ClientEntity> req =
client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(format);
+ req.setFormat(contentType);
final AsyncRequestWrapper<ODataRetrieveResponse<ClientEntity>> async =
client.getAsyncRequestFactory().<ODataRetrieveResponse<ClientEntity>> getAsyncRequestWrapper(req);
@@ -86,7 +86,7 @@ public class AsyncTestITCase extends AbstractTestITCase {
assertEquals(3, entity.getNavigationLinks().size());
- if (ODataFormat.ATOM == format) {
+ if (ContentType.APPLICATION_ATOM_XML.equals(contentType)) {
assertTrue(entity.getAssociationLinks().isEmpty());
// In JSON, association links for each $ref link will exist.
}
@@ -121,22 +121,22 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void withInlineEntryAsAtom() {
- withInlineEntry(ODataFormat.ATOM);
+ withInlineEntry(ContentType.APPLICATION_ATOM_XML);
}
@Test
public void withInlineEntryAsJSON() {
// this needs to be full, otherwise there is no mean to recognize links
- withInlineEntry(ODataFormat.JSON_FULL_METADATA);
+ withInlineEntry(ContentType.JSON_FULL_METADATA);
}
- private void asyncOrders(final ODataFormat format) {
+ private void asyncOrders(final ContentType contentType) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("async").appendEntitySetSegment("Orders");
final ODataEntitySetRequest<ClientEntitySet> req =
client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
+ req.setFormat(contentType);
final AsyncRequestWrapper<ODataRetrieveResponse<ClientEntitySet>> async =
client.getAsyncRequestFactory().<ODataRetrieveResponse<ClientEntitySet>> getAsyncRequestWrapper(req);
@@ -155,11 +155,11 @@ public class AsyncTestITCase extends AbstractTestITCase {
@Test
public void asyncOrdersAsAtom() {
- asyncOrders(ODataFormat.ATOM);
+ asyncOrders(ContentType.APPLICATION_ATOM_XML);
}
@Test
public void asyncOrdersAsJSON() {
- asyncOrders(ODataFormat.JSON);
+ asyncOrders(ContentType.JSON);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
index 47d50c0..123dcd9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
@@ -39,7 +39,6 @@ import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
public class AuthBatchTestITCase extends AbstractTestITCase {
@@ -84,7 +83,7 @@ public class AuthBatchTestITCase extends AbstractTestITCase {
// create new request
ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
streamManager.addRequest(queryReq);
// -------------------------------------------
@@ -108,7 +107,7 @@ public class AuthBatchTestITCase extends AbstractTestITCase {
final ODataEntityUpdateRequest<ClientEntity> changeReq =
client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
- changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
+ changeReq.setFormat(ContentType.JSON_FULL_METADATA);
changeset.addRequest(changeReq);
// -------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/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 50a6260..d039ab2 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
@@ -67,7 +67,6 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
public class BatchTestITCase extends AbstractTestITCase {
@@ -128,20 +127,20 @@ public class BatchTestITCase extends AbstractTestITCase {
for (int i = 1; i <= 2; i++) {
// Create Customer into the changeset
createReq = client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), newOrder(100 + i));
- createReq.setFormat(ODataFormat.JSON);
+ createReq.setFormat(ContentType.JSON);
changeset.addRequest(createReq);
}
targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("WrongEntitySet");
createReq = client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), newOrder(105));
- createReq.setFormat(ODataFormat.JSON);
+ createReq.setFormat(ContentType.JSON);
changeset.addRequest(createReq);
targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Orders");
for (int i = 3; i <= 4; i++) {
// Create Customer into the changeset
createReq = client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), newOrder(100 + i));
- createReq.setFormat(ODataFormat.JSON);
+ createReq.setFormat(ContentType.JSON);
changeset.addRequest(createReq);
}
@@ -193,7 +192,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// create new request
ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
streamManager.addRequest(queryReq);
// -------------------------------------------
@@ -340,7 +339,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// create new request
ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
streamManager.addRequest(queryReq);
// -------------------------------------------
@@ -353,7 +352,7 @@ public class BatchTestITCase extends AbstractTestITCase {
final ClientEntity original = newOrder(2000);
final ODataEntityCreateRequest<ClientEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
- createReq.setFormat(ODataFormat.JSON);
+ createReq.setFormat(ContentType.JSON);
streamManager.addRequest(createReq);
// -------------------------------------------
@@ -407,7 +406,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// create new request
ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
streamManager.addRequest(queryReq);
// -------------------------------------------
@@ -431,7 +430,7 @@ public class BatchTestITCase extends AbstractTestITCase {
final ODataEntityUpdateRequest<ClientEntity> changeReq =
client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.PATCH, patch);
- changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
+ changeReq.setFormat(ContentType.JSON_FULL_METADATA);
changeset.addRequest(changeReq);
@@ -440,7 +439,7 @@ public class BatchTestITCase extends AbstractTestITCase {
final ClientEntity original = newOrder(1000);
final ODataEntityCreateRequest<ClientEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
- createReq.setFormat(ODataFormat.JSON);
+ createReq.setFormat(ContentType.JSON);
changeset.addRequest(createReq);
// -------------------------------------------
@@ -531,7 +530,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// create new request
ODataEntityRequest<ClientEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
- queryReq.setFormat(ODataFormat.JSON);
+ queryReq.setFormat(ContentType.JSON);
async.addRetrieve(queryReq);
// -------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
index 890b878..9782ff0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
@@ -45,17 +45,17 @@ import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.junit.Test;
public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
- private void functions(final ODataFormat format) throws EdmPrimitiveTypeException {
+ private void functions(final ContentType contentType) throws EdmPrimitiveTypeException {
// GetEmployeesCount
URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
final ODataEntityRequest<ClientSingleton> singletonReq =
client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
- singletonReq.setFormat(format);
+ singletonReq.setFormat(contentType);
final ClientSingleton company = singletonReq.execute().getBody();
assertNotNull(company);
@@ -64,7 +64,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientProperty> getEmployeesCountReq =
client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ClientProperty.class);
- getEmployeesCountReq.setFormat(format);
+ getEmployeesCountReq.setFormat(contentType);
final ClientProperty getEmployeesCountRes = getEmployeesCountReq.execute().getBody();
assertNotNull(getEmployeesCountRes);
assertTrue(getEmployeesCountRes.hasPrimitiveValue());
@@ -74,7 +74,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
appendEntitySetSegment("Products").appendKeySegment(5);
ODataEntityRequest<ClientEntity> entityReq = client.getRetrieveRequestFactory().
getEntityRequest(builder.build());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
ClientEntity entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -85,7 +85,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientEntitySet> getProductDetailsReq =
client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ClientEntitySet.class,
Collections.<String, ClientValue> singletonMap("count", count));
- getProductDetailsReq.setFormat(format);
+ getProductDetailsReq.setFormat(contentType);
final ClientEntitySet getProductDetailsRes = getProductDetailsReq.execute().getBody();
assertNotNull(getProductDetailsRes);
assertEquals(1, getProductDetailsRes.getEntities().size());
@@ -97,7 +97,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
builder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("ProductDetails").appendKeySegment(keyMap);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -106,7 +106,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientEntity> getRelatedProductReq =
client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ClientEntity.class);
- getRelatedProductReq.setFormat(format);
+ getRelatedProductReq.setFormat(contentType);
final ClientEntity getRelatedProductRes = getRelatedProductReq.execute().getBody();
assertNotNull(getRelatedProductRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Product",
@@ -117,7 +117,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
builder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Accounts").appendKeySegment(102);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -126,7 +126,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientEntity> getDefaultPIReq =
client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ClientEntity.class);
- getDefaultPIReq.setFormat(format);
+ getDefaultPIReq.setFormat(contentType);
final ClientEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
assertNotNull(getDefaultPIRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
@@ -140,7 +140,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientProperty> getAccountInfoReq =
client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ClientProperty.class);
- getAccountInfoReq.setFormat(format);
+ getAccountInfoReq.setFormat(contentType);
final ClientProperty getAccountInfoRes = getAccountInfoReq.execute().getBody();
assertNotNull(getAccountInfoRes);
assertTrue(getAccountInfoRes.hasComplexValue());
@@ -150,7 +150,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
// GetActualAmount
entityReq = client.getRetrieveRequestFactory().getEntityRequest(
entity.getNavigationLink("MyGiftCard").getLink());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
entity = entityReq.execute().getBody();
assertNotNull(entity);
assertEquals(301, entity.getProperty("GiftCardID").getPrimitiveValue().toCastValue(Integer.class), 0);
@@ -162,7 +162,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientProperty> getActualAmountReq =
client.getInvokeRequestFactory().getFunctionInvokeRequest(boundOp.getTarget(), ClientProperty.class,
Collections.<String, ClientValue> singletonMap("bonusRate", bonusRate));
- getActualAmountReq.setFormat(format);
+ getActualAmountReq.setFormat(contentType);
final ClientProperty getActualAmountRes = getActualAmountReq.execute().getBody();
assertNotNull(getActualAmountRes);
assertEquals(41.79, getActualAmountRes.getPrimitiveValue().toCastValue(Double.class), 0);
@@ -170,12 +170,12 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
@Test
public void atomFunctions() throws EdmPrimitiveTypeException {
- functions(ODataFormat.ATOM);
+ functions(ContentType.APPLICATION_ATOM_XML);
}
@Test
public void jsonFunctions() throws EdmPrimitiveTypeException {
- functions(ODataFormat.JSON_FULL_METADATA);
+ functions(ContentType.JSON_FULL_METADATA);
}
@Test
@@ -264,12 +264,12 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
assertEquals(41.79, getActualAmountRes.getPrimitiveValue().toCastValue(Double.class), 0);
}
- private void actions(final ODataFormat format) throws EdmPrimitiveTypeException {
+ private void actions(final ContentType contentType) throws EdmPrimitiveTypeException {
// IncreaseRevenue
URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
ODataEntityRequest<ClientEntity> entityReq =
client.getRetrieveRequestFactory().getEntityRequest(builder.build());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
ClientEntity entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -281,7 +281,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientProperty> increaseRevenueReq =
client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ClientProperty.class,
Collections.<String, ClientValue> singletonMap("IncreaseValue", increaseValue));
- increaseRevenueReq.setFormat(format);
+ increaseRevenueReq.setFormat(contentType);
final ClientProperty increaseRevenueRes = increaseRevenueReq.execute().getBody();
assertNotNull(increaseRevenueRes);
assertTrue(increaseRevenueRes.hasPrimitiveValue());
@@ -290,7 +290,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
builder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Products").appendKeySegment(5);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -302,7 +302,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientProperty> getProductDetailsReq =
client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ClientProperty.class,
Collections.<String, ClientValue> singletonMap("accessRight", accessRight));
- getProductDetailsReq.setFormat(format);
+ getProductDetailsReq.setFormat(contentType);
final ClientProperty getProductDetailsRes = getProductDetailsReq.execute().getBody();
assertNotNull(getProductDetailsRes);
assertTrue(getProductDetailsRes.hasEnumValue());
@@ -311,7 +311,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
builder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customers").appendKeySegment(2);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -336,7 +336,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
params.put("index", index);
final ODataInvokeRequest<ClientEntity> resetAddressReq =
client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ClientEntity.class, params);
- resetAddressReq.setFormat(format);
+ resetAddressReq.setFormat(contentType);
final ClientEntity resetAddressRes = resetAddressReq.execute().getBody();
assertNotNull(resetAddressRes);
assertEquals(2, resetAddressRes.getProperty("PersonID").getPrimitiveValue().toCastValue(Integer.class), 0);
@@ -345,7 +345,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
builder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Accounts").appendKeySegment(102);
entityReq = client.getRetrieveRequestFactory().getEntityRequest(builder.build());
- entityReq.setFormat(format);
+ entityReq.setFormat(contentType);
entity = entityReq.execute().getBody();
assertNotNull(entity);
@@ -359,7 +359,7 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ClientEntity> getDefaultPIReq =
client.getInvokeRequestFactory().getActionInvokeRequest(boundOp.getTarget(), ClientEntity.class,
Collections.<String, ClientValue> singletonMap("newDate", newDate));
- getDefaultPIReq.setFormat(format);
+ getDefaultPIReq.setFormat(contentType);
final ClientEntity getDefaultPIRes = getDefaultPIReq.execute().getBody();
assertNotNull(getDefaultPIRes);
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
@@ -370,12 +370,12 @@ public class BoundOperationInvokeTestITCase extends AbstractTestITCase {
@Test
public void atomActions() throws EdmPrimitiveTypeException {
- actions(ODataFormat.ATOM);
+ actions(ContentType.APPLICATION_ATOM_XML);
}
@Test
public void jsonActions() throws EdmPrimitiveTypeException {
- actions(ODataFormat.JSON_FULL_METADATA);
+ actions(ContentType.JSON_FULL_METADATA);
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
index 472928f..2e9fe5a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
@@ -54,7 +54,7 @@ import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.junit.Test;
/**
@@ -118,7 +118,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final ODataEntityCreateRequest<ClientEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest(
getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Orders").build(), order);
- req.setFormat(ODataFormat.JSON_FULL_METADATA);
+ req.setFormat(ContentType.JSON_FULL_METADATA);
// check for OData-Version
assertEquals("4.0", req.getHeader("OData-Version"));
@@ -126,13 +126,13 @@ public class ConformanceTestITCase extends AbstractTestITCase {
// check for Content-Type
assertEquals(
- ODataFormat.JSON_FULL_METADATA.getContentType().toContentTypeString(),
+ ContentType.JSON_FULL_METADATA.toContentTypeString(),
req.getHeader("Content-Type"));
assertEquals(
- ODataFormat.JSON_FULL_METADATA.getContentType().toContentTypeString(),
+ ContentType.JSON_FULL_METADATA.toContentTypeString(),
req.getHeader(HeaderName.contentType.toString()));
assertEquals(
- ODataFormat.JSON_FULL_METADATA.getContentType().toContentTypeString(),
+ ContentType.JSON_FULL_METADATA.toContentTypeString(),
req.getContentType());
final ClientEntity created = req.execute().getBody();
@@ -179,7 +179,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
ODataEntitySetRequest<ClientEntitySet> req = client.getRetrieveRequestFactory().
getEntitySetRequest(uriBuilder.build());
- req.setFormat(ODataFormat.JSON_FULL_METADATA);
+ req.setFormat(ContentType.JSON_FULL_METADATA);
req.setPrefer(client.newPreferences().maxPageSize(5));
ODataRetrieveResponse<ClientEntitySet> res = req.execute();
@@ -196,7 +196,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
assertEquals(expected, found);
req = client.getRetrieveRequestFactory().getEntitySetRequest(found);
- req.setFormat(ODataFormat.JSON_FULL_METADATA);
+ req.setFormat(ContentType.JSON_FULL_METADATA);
res = req.execute();
feed = res.getBody();
@@ -236,7 +236,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
appendEntitySetSegment("RowIndex").appendKeySegment(id);
- rowIndex = read(ODataFormat.JSON_FULL_METADATA, builder.build());
+ rowIndex = read(ContentType.JSON_FULL_METADATA, builder.build());
assertNotNull(rowIndex);
assertEquals(EdmPrimitiveTypeKind.Int32, rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.String, rowIndex.getProperty("aString").getPrimitiveValue().getTypeKind());
@@ -269,7 +269,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final ODataEntityUpdateResponse<ClientEntity> res = req.execute();
assertEquals(204, res.getStatusCode());
- final ClientEntity actual = read(ODataFormat.JSON, uri);
+ final ClientEntity actual = read(ContentType.JSON, uri);
assertEquals(newname, actual.getProperty("FirstName").getPrimitiveValue().toString());
}
@@ -288,7 +288,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final ODataEntityRequest<ClientEntity> req =
client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataFormat.JSON_FULL_METADATA);
+ req.setFormat(ContentType.JSON_FULL_METADATA);
assertNotNull(req.execute().getBody());
@@ -305,7 +305,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
appendRefSegment();
ODataEntityRequest<ClientEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataFormat.JSON_FULL_METADATA);
+ req.setFormat(ContentType.JSON_FULL_METADATA);
ODataRetrieveResponse<ClientEntity> res = req.execute();
assertNotNull(res);
@@ -318,7 +318,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
appendEntityIdSegment(entity.getId().toASCIIString()).build();
req = client.getRetrieveRequestFactory().getEntityRequest(referenceURI);
- req.setFormat(ODataFormat.JSON_FULL_METADATA);
+ req.setFormat(ContentType.JSON_FULL_METADATA);
res = req.execute();
assertNotNull(res);
@@ -339,7 +339,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
assertNotNull(customers.getDeltaLink());
final ODataDeltaRequest deltaReq = client.getRetrieveRequestFactory().getDeltaRequest(customers.getDeltaLink());
- deltaReq.setFormat(ODataFormat.JSON_FULL_METADATA);
+ deltaReq.setFormat(ContentType.JSON_FULL_METADATA);
final ClientDelta delta = deltaReq.execute().getBody();
assertNotNull(delta);
@@ -381,7 +381,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final ODataEntitySetRequest<ClientEntitySet> req =
client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(ODataFormat.JSON_FULL_METADATA);
+ req.setFormat(ContentType.JSON_FULL_METADATA);
final AsyncRequestWrapper<ODataRetrieveResponse<ClientEntitySet>> async =
client.getAsyncRequestFactory().<ODataRetrieveResponse<ClientEntitySet>> getAsyncRequestWrapper(req);
@@ -408,7 +408,7 @@ public class ConformanceTestITCase extends AbstractTestITCase {
final ODataEntityRequest<ClientEntity> req =
client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataFormat.JSON);
+ req.setFormat(ContentType.JSON);
assertEquals("application/json;odata.metadata=minimal", req.getHeader("Accept"));
assertEquals("application/json;odata.metadata=minimal", req.getHeader(HeaderName.accept.toString()));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
index 1d02141..dc2c246 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
@@ -27,12 +27,12 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe
import org.apache.olingo.client.api.domain.ClientDelta;
import org.apache.olingo.client.api.domain.ClientEntitySet;
import org.apache.olingo.client.api.domain.ClientProperty;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.junit.Test;
public class DeltaTestITCase extends AbstractTestITCase {
- private void parse(final ODataFormat format) {
+ private void parse(final ContentType format) {
final ODataEntitySetRequest<ClientEntitySet> req = client.getRetrieveRequestFactory().getEntitySetRequest(
client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customers").build());
req.setPrefer(client.newPreferences().trackChanges());
@@ -76,11 +76,11 @@ public class DeltaTestITCase extends AbstractTestITCase {
@Test
public void atomParse() {
- parse(ODataFormat.ATOM);
+ parse(ContentType.APPLICATION_ATOM_XML);
}
@Test
public void jsonParse() {
- parse(ODataFormat.JSON);
+ parse(ContentType.JSON);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/588df780/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
index 401f6e8..47e71e0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
@@ -36,19 +36,19 @@ import org.apache.olingo.client.api.domain.ClientValuable;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.format.ContentType;
import org.junit.Test;
public class DerivedTypeTestITCase extends AbstractTestITCase {
- private void read(final ODataFormat format) {
+ private void read(final ContentType contentType) {
// 1. entity set
URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("People").
appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.Customer");
ODataEntitySetRequest<ClientEntitySet> req = client.getRetrieveRequestFactory().
getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
+ req.setFormat(contentType);
for (ClientEntity customer : req.execute().getBody().getEntities()) {
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Customer", customer.getTypeName().toString());
@@ -60,7 +60,7 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
appendNavigationSegment("MyPaymentInstruments").
appendDerivedEntityTypeSegment("Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI");
req = client.getRetrieveRequestFactory().getEntitySetRequest(uriBuilder.build());
- req.setFormat(format);
+ req.setFormat(contentType);
for (ClientEntity customer : req.execute().getBody().getEntities()) {
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI", customer.getTypeName().toString());
@@ -69,15 +69,15 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
@Test
public void readfromAtom() {
- read(ODataFormat.ATOM);
+ read(ContentType.APPLICATION_ATOM_XML);
}
@Test
public void readfromJSON() {
- read(ODataFormat.JSON_FULL_METADATA);
+ read(ContentType.JSON_FULL_METADATA);
}
- private void createDelete(final ODataFormat format) {
+ private void createDelete(final ContentType conentType) {
final ClientEntity customer = client.getObjectFactory().
newEntity(new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Customer"));
@@ -119,7 +119,7 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
getEntityCreateRequest(
client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("People").build(),
customer);
- createReq.setFormat(format);
+ createReq.setFormat(conentType);
final ODataEntityCreateResponse<ClientEntity> createRes = createReq.execute();
assertEquals(201, createRes.getStatusCode());
@@ -127,7 +127,7 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
final ODataEntityRequest<ClientEntity> fetchReq = client.getRetrieveRequestFactory().
getEntityRequest(client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("People").appendKeySegment(976).build());
- fetchReq.setFormat(format);
+ fetchReq.setFormat(conentType);
final ClientEntity actual = fetchReq.execute().getBody();
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Customer", actual.getTypeName().toString());
@@ -140,11 +140,11 @@ public class DerivedTypeTestITCase extends AbstractTestITCase {
@Test
public void createDeleteAsAtom() {
- createDelete(ODataFormat.ATOM);
+ createDelete(ContentType.APPLICATION_ATOM_XML);
}
@Test
public void createDeleteAsJSON() {
- createDelete(ODataFormat.JSON_FULL_METADATA);
+ createDelete(ContentType.JSON_FULL_METADATA);
}
}