You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2014/06/13 15:28:27 UTC
[5/5] git commit: [OLINGO-317] Merged the format ENUMs
[OLINGO-317] Merged the format ENUMs
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/37abba5f
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/37abba5f
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/37abba5f
Branch: refs/heads/Olingo-317_DeSerializerRefactoring
Commit: 37abba5f0e1b3e37c48524800390304657e5444e
Parents: b15439f
Author: Michael Bolz <mi...@sap.com>
Authored: Fri Jun 13 15:16:50 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Fri Jun 13 15:26:16 2014 +0200
----------------------------------------------------------------------
.../ext/proxy/EntityContainerFactory.java | 5 +-
.../commons/AbstractPersistenceManager.java | 9 +-
.../proxy/commons/EntityInvocationHandler.java | 8 +-
.../commons/EntitySetInvocationHandler.java | 6 +-
.../NonTransactionalPersistenceManagerImpl.java | 6 +-
.../olingo/fit/AbstractBaseTestITCase.java | 5 +-
.../olingo/fit/v3/AbstractTestITCase.java | 29 +--
.../apache/olingo/fit/v3/BatchTestITCase.java | 20 +-
.../apache/olingo/fit/v3/CountTestITCase.java | 16 +-
.../olingo/fit/v3/EntityCreateTestITCase.java | 46 ++--
.../olingo/fit/v3/EntityRetrieveTestITCase.java | 41 ++--
.../olingo/fit/v3/EntitySetTestITCase.java | 31 +--
.../olingo/fit/v3/EntityUpdateTestITCase.java | 30 +--
.../apache/olingo/fit/v3/ErrorTestITCase.java | 30 ++-
.../apache/olingo/fit/v3/InvokeTestITCase.java | 27 +--
.../olingo/fit/v3/KeyAsSegmentTestITCase.java | 16 +-
.../olingo/fit/v3/MediaEntityTestITCase.java | 24 +-
.../olingo/fit/v3/OpenTypeTestITCase.java | 17 +-
.../olingo/fit/v3/PrimitiveKeysTestITCase.java | 12 +-
.../olingo/fit/v3/PropertyTestITCase.java | 10 +-
.../olingo/fit/v3/PropertyValueTestITCase.java | 31 ++-
.../olingo/fit/v3/QueryOptionsTestITCase.java | 15 +-
.../olingo/fit/v4/AbstractTestITCase.java | 16 +-
.../apache/olingo/fit/v4/AsyncTestITCase.java | 17 +-
.../olingo/fit/v4/AuthBatchTestITCase.java | 11 +-
.../apache/olingo/fit/v4/BatchTestITCase.java | 29 +--
.../fit/v4/BoundOperationInvokeTestITCase.java | 15 +-
.../olingo/fit/v4/ConformanceTestITCase.java | 35 +--
.../apache/olingo/fit/v4/DeltaTestITCase.java | 8 +-
.../olingo/fit/v4/DerivedTypeTestITCase.java | 14 +-
.../olingo/fit/v4/EntityCreateTestITCase.java | 19 +-
.../olingo/fit/v4/EntityRetrieveTestITCase.java | 69 +++---
.../olingo/fit/v4/EntitySetTestITCase.java | 33 +--
.../olingo/fit/v4/EntityUpdateTestITCase.java | 25 ++-
.../olingo/fit/v4/ErrorResponseTestITCase.java | 5 +-
.../olingo/fit/v4/FilterFactoryTestITCase.java | 5 +-
.../fit/v4/JSONFormatConformanceTestITCase.java | 12 +-
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 23 +-
.../olingo/fit/v4/MediaEntityTestITCase.java | 23 +-
.../olingo/fit/v4/OpenTypeTestITCase.java | 19 +-
.../fit/v4/OperationImportInvokeTestITCase.java | 22 +-
.../olingo/fit/v4/PropertyValueTestITCase.java | 19 +-
.../olingo/fit/v4/QueryOptionsTestITCase.java | 11 +-
.../olingo/fit/v4/SingletonTestITCase.java | 29 +--
.../olingo/client/api/CommonConfiguration.java | 29 +--
.../olingo/client/api/CommonODataClient.java | 6 +-
.../request/ODataBasicRequest.java | 16 +-
.../request/cud/ODataDeleteRequest.java | 3 +-
.../request/cud/ODataEntityCreateRequest.java | 3 +-
.../request/cud/ODataEntityUpdateRequest.java | 3 +-
.../request/cud/ODataPropertyUpdateRequest.java | 3 +-
.../request/cud/ODataValueUpdateRequest.java | 3 +-
.../request/cud/v3/ODataLinkCreateRequest.java | 3 +-
.../request/cud/v3/ODataLinkUpdateRequest.java | 3 +-
.../request/invoke/ODataInvokeRequest.java | 4 +-
.../request/retrieve/EdmMetadataRequest.java | 3 +-
.../request/retrieve/ODataEntityRequest.java | 3 +-
.../retrieve/ODataEntitySetIteratorRequest.java | 3 +-
.../request/retrieve/ODataEntitySetRequest.java | 4 +-
.../request/retrieve/ODataMediaRequest.java | 3 +-
.../request/retrieve/ODataPropertyRequest.java | 2 +-
.../request/retrieve/ODataRetrieveRequest.java | 5 +-
.../retrieve/ODataServiceDocumentRequest.java | 3 +-
.../request/retrieve/ODataValueRequest.java | 3 +-
.../request/retrieve/XMLMetadataRequest.java | 4 +-
.../retrieve/v3/ODataLinkCollectionRequest.java | 3 +-
.../request/retrieve/v4/ODataDeltaRequest.java | 3 +-
.../streamed/ODataStreamedEntityRequest.java | 10 +-
.../api/domain/ODataEntitySetIterator.java | 16 +-
.../api/serialization/CommonODataReader.java | 5 +-
.../client/api/serialization/ODataWriter.java | 5 +-
.../api/serialization/v3/ODataReader.java | 7 +-
.../api/serialization/v4/ODataReader.java | 5 +-
.../olingo/client/api/v3/Configuration.java | 25 ---
.../olingo/client/api/v3/ODataClient.java | 9 +-
.../olingo/client/api/v4/ODataClient.java | 9 +-
.../client/core/AbstractConfiguration.java | 224 -------------------
.../olingo/client/core/AbstractODataClient.java | 2 -
.../olingo/client/core/Configuration.java | 197 ++++++++++++++++
.../olingo/client/core/ODataClientFactory.java | 7 +-
.../request/AbstractODataBasicRequest.java | 39 ++--
.../request/AbstractODataRequest.java | 103 +--------
.../request/cud/ODataDeleteRequestImpl.java | 21 +-
.../cud/ODataEntityCreateRequestImpl.java | 21 +-
.../cud/ODataEntityUpdateRequestImpl.java | 18 +-
.../cud/ODataPropertyUpdateRequestImpl.java | 11 +-
.../cud/ODataValueUpdateRequestImpl.java | 27 ++-
.../cud/v3/ODataLinkCreateRequestImpl.java | 12 +-
.../cud/v3/ODataLinkUpdateRequestImpl.java | 12 +-
.../invoke/AbstractODataInvokeRequest.java | 25 ++-
.../invoke/v3/ODataInvokeRequestImpl.java | 7 +-
.../invoke/v4/ODataInvokeRequestImpl.java | 9 +-
.../retrieve/AbstractMetadataRequestImpl.java | 6 +-
.../retrieve/AbstractODataRetrieveRequest.java | 29 +--
.../retrieve/ODataEntityRequestImpl.java | 13 +-
.../ODataEntitySetIteratorRequestImpl.java | 23 +-
.../retrieve/ODataEntitySetRequestImpl.java | 19 +-
.../request/retrieve/ODataMediaRequestImpl.java | 20 +-
.../retrieve/ODataPropertyRequestImpl.java | 15 +-
.../request/retrieve/ODataRawRequestImpl.java | 12 +-
.../ODataServiceDocumentRequestImpl.java | 12 +-
.../request/retrieve/ODataValueRequestImpl.java | 23 +-
.../v3/ODataLinkCollectionRequestImpl.java | 16 +-
.../retrieve/v4/ODataDeltaRequestImpl.java | 13 +-
.../AbstractODataStreamedEntityRequest.java | 15 +-
.../streamed/AbstractODataStreamedRequest.java | 20 +-
.../request/v4/AsyncRequestWrapperImpl.java | 4 +-
.../AbstractODataDeserializer.java | 7 +-
.../core/serialization/AbstractODataReader.java | 28 ++-
.../core/serialization/ODataWriterImpl.java | 5 +-
.../serialization/v3/ODataDeserializerImpl.java | 5 +-
.../core/serialization/v3/ODataReaderImpl.java | 7 +-
.../serialization/v4/ODataDeserializerImpl.java | 8 +-
.../core/serialization/v4/ODataReaderImpl.java | 5 +-
.../client/core/uri/v3/URIBuilderImpl.java | 10 +-
.../client/core/uri/v4/URIBuilderImpl.java | 8 +-
.../client/core/v3/ConfigurationImpl.java | 32 ---
.../olingo/client/core/v3/ODataClientImpl.java | 16 +-
.../client/core/v4/ConfigurationImpl.java | 32 ---
.../olingo/client/core/v4/ODataClientImpl.java | 13 +-
.../apache/olingo/client/core/AbstractTest.java | 7 +-
.../apache/olingo/client/core/v3/AtomTest.java | 13 +-
.../olingo/client/core/v3/EntitySetTest.java | 8 +-
.../olingo/client/core/v3/EntityTest.java | 32 +--
.../apache/olingo/client/core/v3/ErrorTest.java | 18 +-
.../apache/olingo/client/core/v3/JSONTest.java | 13 +-
.../apache/olingo/client/core/v4/AtomTest.java | 10 +-
.../olingo/client/core/v4/EntitySetTest.java | 14 +-
.../olingo/client/core/v4/EntityTest.java | 63 +++---
.../apache/olingo/client/core/v4/ErrorTest.java | 12 +-
.../apache/olingo/client/core/v4/JSONTest.java | 21 +-
.../olingo/commons/api/format/ContentType.java | 16 +-
.../olingo/commons/api/format/Format.java | 26 ---
.../olingo/commons/api/format/ODataFormat.java | 64 ++++--
.../commons/api/format/ODataMediaFormat.java | 76 -------
.../commons/api/format/ODataPubFormat.java | 102 ---------
.../commons/api/format/ODataValueFormat.java | 81 -------
.../core/serialization/AtomDeserializer.java | 7 +-
.../org/apache/olingo/server/api/OData.java | 2 +-
.../server/api/processor/DefaultProcessor.java | 2 +-
.../server/api/serializer/ODataFormat.java | 23 --
.../apache/olingo/server/core/ODataImpl.java | 4 +-
.../tecsvc/processor/SampleJsonProcessor.java | 8 +-
.../serializer/json/ServiceDocumentTest.java | 2 +-
.../serializer/xml/MetadataDocumentTest.java | 2 +-
145 files changed, 1193 insertions(+), 1683 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/EntityContainerFactory.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/EntityContainerFactory.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/EntityContainerFactory.java
index c36aa77..84b4995 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/EntityContainerFactory.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/EntityContainerFactory.java
@@ -21,9 +21,10 @@ package org.apache.olingo.ext.proxy;
import java.lang.reflect.Proxy;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+
import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.commons.EntityContainerInvocationHandler;
import org.apache.olingo.ext.proxy.commons.NonTransactionalPersistenceManagerImpl;
@@ -47,7 +48,7 @@ public final class EntityContainerFactory<C extends CommonEdmEnabledODataClient<
final C client, final boolean transactional) {
if (!FACTORY_PER_SERVICEROOT.containsKey(client.getServiceRoot())) {
- client.getConfiguration().setDefaultPubFormat(ODataPubFormat.JSON_FULL_METADATA);
+ client.getConfiguration().setDefaultPubFormat(ODataFormat.JSON_FULL_METADATA);
final EntityContainerFactory<C> instance = new EntityContainerFactory<C>(client, transactional);
FACTORY_PER_SERVICEROOT.put(client.getServiceRoot(), instance);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
index 67369ef..492c751 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
@@ -28,6 +28,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.header.ODataPreferences;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
@@ -40,7 +41,7 @@ import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.commons.api.domain.ODataLinkType;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
-import org.apache.olingo.commons.api.format.ODataMediaFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.ext.proxy.EntityContainerFactory;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
@@ -150,7 +151,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
final Set<EntityInvocationHandler> toBeLinked = new HashSet<EntityInvocationHandler>();
for (Object proxy : type == ODataLinkType.ENTITY_SET_NAVIGATION
- ? (Collection) property.getValue() : Collections.singleton(property.getValue())) {
+ ? (Collection<?>) property.getValue() : Collections.singleton(property.getValue())) {
final EntityInvocationHandler target = (EntityInvocationHandler) Proxy.getInvocationHandler(proxy);
@@ -354,8 +355,8 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
factory.getClient().getCUDRequestFactory().getMediaEntityUpdateRequest(uri, input);
req.setContentType(StringUtils.isBlank(handler.getEntity().getMediaContentType())
- ? ODataMediaFormat.WILDCARD.toString()
- : ODataMediaFormat.fromFormat(handler.getEntity().getMediaContentType()).toString());
+ ? ODataFormat.WILDCARD.toString()
+ : ODataFormat.fromString(handler.getEntity().getMediaContentType()).toString());
if (StringUtils.isNotBlank(handler.getETag())) {
req.setIfMatch(handler.getETag());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/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 9b52e34..aa81921 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
@@ -32,17 +32,17 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
-import org.apache.olingo.commons.api.domain.ODataLinked;
import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-import org.apache.olingo.commons.api.format.ODataMediaFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
@@ -108,7 +108,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
final Class<?> typeRef,
final EntityContainerInvocationHandler containerHandler) {
- super(typeRef, (ODataLinked) entity, containerHandler);
+ super(typeRef, entity, containerHandler);
this.entityURI = entityURI;
this.internal = entity;
@@ -325,7 +325,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
final ODataMediaRequest retrieveReq = getClient().getRetrieveRequestFactory().
getMediaEntityRequest(contentSource);
- retrieveReq.setFormat(ODataMediaFormat.fromFormat(contentType));
+ retrieveReq.setFormat(ODataFormat.fromString(contentType));
this.stream = retrieveReq.execute().getBody();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/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 71d8755..ec00a75 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
@@ -31,6 +31,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
+
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.ImmutableTriple;
import org.apache.commons.lang3.tuple.Triple;
@@ -48,7 +49,7 @@ import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -141,7 +142,6 @@ class EntitySetInvocationHandler<
}
@Override
- @SuppressWarnings("unchecked")
public Object invoke(final Object proxy, final Method method, final Object[] args) throws Throwable {
if (isSelfMethod(method, args)) {
return invokeSelfMethod(method, args);
@@ -183,7 +183,7 @@ class EntitySetInvocationHandler<
public Long count() {
final ODataValueRequest req = getClient().getRetrieveRequestFactory().
getValueRequest(getClient().newURIBuilder(this.uri.toASCIIString()).count().build());
- req.setFormat(ODataValueFormat.TEXT);
+ req.setFormat(ODataFormat.TEXT_PLAIN);
return Long.valueOf(req.execute().getBody().asPrimitive().toString());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java
index dedd338..6f36148 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java
@@ -43,13 +43,13 @@ public class NonTransactionalPersistenceManagerImpl extends AbstractPersistenceM
protected void doFlush(final PersistenceChanges changes, final TransactionItems items) {
for (Map.Entry<ODataBatchableRequest, EntityInvocationHandler> entry : changes.getChanges().entrySet()) {
try {
- final ODataResponse response = ((ODataBasicRequest<?, ?>) entry.getKey()).execute();
+ final ODataResponse response = ((ODataBasicRequest<?>) entry.getKey()).execute();
if (response instanceof ODataEntityCreateResponse && response.getStatusCode() == 201) {
- entry.getValue().setEntity(((ODataEntityCreateResponse) response).getBody());
+ entry.getValue().setEntity(((ODataEntityCreateResponse<?>) response).getBody());
LOG.debug("Upgrade created object '{}'", entry.getValue());
} else if (response instanceof ODataEntityUpdateResponse && response.getStatusCode() == 200) {
- entry.getValue().setEntity(((ODataEntityUpdateResponse) response).getBody());
+ entry.getValue().setEntity(((ODataEntityUpdateResponse<?>) response).getBody());
LOG.debug("Upgrade updated object '{}'", entry.getValue());
}
} catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/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 cef8d11..f54b5b8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java
@@ -30,7 +30,6 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -79,14 +78,14 @@ public abstract class AbstractBaseTestITCase {
if (LOG.isDebugEnabled()) {
StringWriter writer = new StringWriter();
try {
- getClient().getSerializer(ODataPubFormat.ATOM).write(writer, getClient().getBinder().getEntity(entity));
+ getClient().getSerializer(ODataFormat.ATOM).write(writer, getClient().getBinder().getEntity(entity));
} catch (final ODataSerializerException e) {}
writer.flush();
LOG.debug(message + " (Atom)\n{}", writer.toString());
writer = new StringWriter();
try {
- getClient().getSerializer(ODataPubFormat.JSON).write(writer, getClient().getBinder().getEntity(entity));
+ getClient().getSerializer(ODataFormat.JSON).write(writer, getClient().getBinder().getEntity(entity));
} catch (final ODataSerializerException e) {}
writer.flush();
LOG.debug(message + " (JSON)\n{}", writer.toString());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
index aacecdc..6e694e2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java
@@ -34,6 +34,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
@@ -49,7 +50,6 @@ import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
import org.apache.olingo.client.api.v3.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
-import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
@@ -64,7 +64,8 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.junit.BeforeClass;
public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
@@ -223,7 +224,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
}
- protected ODataEntity getSampleCustomerInfo(final int id, final String sampleinfo) {
+ protected ODataEntity getSampleCustomerInfo(final String sampleinfo) {
final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
"Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo"));
entity.setMediaEntity(true);
@@ -288,7 +289,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
if (withInlineInfo) {
final ODataInlineEntity inlineInfo = getClient().getObjectFactory().newDeepInsertEntity(
"Info",
- getSampleCustomerInfo(id, sampleName + "_Info"));
+ getSampleCustomerInfo(sampleName + "_Info"));
inlineInfo.getEntity().setMediaEntity(true);
entity.addLink(inlineInfo);
}
@@ -306,7 +307,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
}
- protected ODataEntity read(final ODataPubFormat format, final URI editLink) {
+ protected ODataEntity read(final ODataFormat format, final URI editLink) {
final ODataEntityRequest<ODataEntity> req = getClient().getRetrieveRequestFactory().
getEntityRequest(editLink);
req.setFormat(format);
@@ -316,7 +317,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
assertNotNull(entity);
- if (ODataPubFormat.JSON_FULL_METADATA == format || ODataPubFormat.ATOM == format) {
+ if (ODataFormat.JSON_FULL_METADATA == format || ODataFormat.ATOM == format) {
assertEquals(req.getURI(), entity.getEditLink());
}
@@ -325,7 +326,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
protected ODataEntity createEntity(
final String serviceRootURL,
- final ODataPubFormat format,
+ final ODataFormat format,
final ODataEntity original,
final String entitySetName) {
@@ -351,7 +352,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected ODataEntity compareEntities(final String serviceRootURL,
- final ODataPubFormat format,
+ final ODataFormat format,
final ODataEntity original,
final int actualObjectId,
final Collection<String> expands) {
@@ -388,7 +389,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void cleanAfterCreate(
- final ODataPubFormat format,
+ final ODataFormat format,
final ODataEntity created,
final boolean includeInline,
final String baseUri) {
@@ -431,7 +432,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
getEntityRequest(link);
// bug that needs to be fixed on the SampleService - cannot get entity not found with header
// Accept: application/json;odata=minimalmetadata
- retrieveReq.setFormat(format == ODataPubFormat.JSON_FULL_METADATA ? ODataPubFormat.JSON : format);
+ retrieveReq.setFormat(format == ODataFormat.JSON_FULL_METADATA ? ODataFormat.JSON : format);
Exception exception = null;
try {
@@ -446,19 +447,19 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void updateEntityDescription(
- final ODataPubFormat format, final ODataEntity changes, final UpdateType type) {
+ final ODataFormat format, final ODataEntity changes, final UpdateType type) {
updateEntityDescription(format, changes, type, null);
}
protected void updateEntityDescription(
- final ODataPubFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
+ final ODataFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
updateEntityStringProperty("Description", format, changes, type, etag);
}
protected void updateEntityStringProperty(final String propertyName,
- final ODataPubFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
+ final ODataFormat format, final ODataEntity changes, final UpdateType type, final String etag) {
final URI editLink = changes.getEditLink();
@@ -497,7 +498,7 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
}
protected void update(
- final UpdateType type, final ODataEntity changes, final ODataPubFormat format, final String etag) {
+ final UpdateType type, final ODataEntity changes, final ODataFormat format, final String etag) {
final ODataEntityUpdateRequest<ODataEntity> req =
getClient().getCUDRequestFactory().getEntityUpdateRequest(type, changes);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
index 18ebaad..88bbfb9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java
@@ -19,8 +19,8 @@
package org.apache.olingo.fit.v3;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
@@ -28,6 +28,7 @@ import java.net.URI;
import java.util.Iterator;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
+
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
@@ -56,8 +57,7 @@ import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
-import static org.apache.olingo.fit.v3.AbstractTestITCase.client;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
public class BatchTestITCase extends AbstractTestITCase {
@@ -116,7 +116,7 @@ public class BatchTestITCase extends AbstractTestITCase {
createReq = client.getCUDRequestFactory().getEntityCreateRequest(
targetURI.build(),
getSampleCustomerProfile(100 + i, "Sample customer", false));
- createReq.setFormat(ODataPubFormat.JSON);
+ createReq.setFormat(ODataFormat.JSON);
changeset.addRequest(createReq);
}
@@ -124,7 +124,7 @@ public class BatchTestITCase extends AbstractTestITCase {
createReq = client.getCUDRequestFactory().getEntityCreateRequest(
targetURI.build(),
getSampleCustomerProfile(105, "Sample customer", false));
- createReq.setFormat(ODataPubFormat.JSON);
+ createReq.setFormat(ODataFormat.JSON);
changeset.addRequest(createReq);
targetURI = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Customer");
@@ -133,7 +133,7 @@ public class BatchTestITCase extends AbstractTestITCase {
createReq = client.getCUDRequestFactory().getEntityCreateRequest(
targetURI.build(),
getSampleCustomerProfile(100 + i, "Sample customer", false));
- createReq.setFormat(ODataPubFormat.ATOM);
+ createReq.setFormat(ODataFormat.ATOM);
changeset.addRequest(createReq);
}
@@ -318,7 +318,7 @@ public class BatchTestITCase extends AbstractTestITCase {
// create new request
ODataEntityRequest<ODataEntity> queryReq = client.getRetrieveRequestFactory().getEntityRequest(targetURI.build());
- queryReq.setFormat(ODataPubFormat.ATOM);
+ queryReq.setFormat(ODataFormat.ATOM);
streamManager.addRequest(queryReq);
// -------------------------------------------
@@ -340,9 +340,9 @@ public class BatchTestITCase extends AbstractTestITCase {
"Description",
client.getObjectFactory().newPrimitiveValueBuilder().buildString("new description from batch")));
- final ODataEntityUpdateRequest changeReq =
+ final ODataEntityUpdateRequest<?> changeReq =
client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.MERGE, merge);
- changeReq.setFormat(ODataPubFormat.JSON_FULL_METADATA);
+ changeReq.setFormat(ODataFormat.JSON_FULL_METADATA);
changeReq.setIfMatch(getETag(editLink));
changeset.addRequest(changeReq);
@@ -352,7 +352,7 @@ public class BatchTestITCase extends AbstractTestITCase {
final ODataEntity original = getSampleCustomerProfile(1000, "Sample customer", false);
final ODataEntityCreateRequest<ODataEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(targetURI.build(), original);
- createReq.setFormat(ODataPubFormat.ATOM);
+ createReq.setFormat(ODataFormat.ATOM);
changeset.addRequest(createReq);
// Delete customer created above
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
index 56c7902..673acdf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java
@@ -18,14 +18,16 @@
*/
package org.apache.olingo.fit.v3;
-import static org.junit.Assert.*;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest;
-import org.apache.olingo.commons.api.domain.ODataValue;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
+import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.format.ODataFormat;
+import org.junit.Test;
public class CountTestITCase extends AbstractTestITCase {
@@ -34,7 +36,7 @@ public class CountTestITCase extends AbstractTestITCase {
CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customer").count();
final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
+ req.setFormat(ODataFormat.TEXT_PLAIN);
try {
final ODataValue value = req.execute().getBody();
assertTrue(10 <= Integer.parseInt(value.toString()));
@@ -48,10 +50,10 @@ public class CountTestITCase extends AbstractTestITCase {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customer").count();
final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
+ req.setFormat(ODataFormat.TEXT_PLAIN);
req.setAccept("application/json;odata=fullmetadata");
try {
- final ODataValue value = req.execute().getBody();
+ req.execute().getBody();
fail();
} catch (ODataClientErrorException e) {
assertEquals(415, e.getStatusLine().getStatusCode());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
index 0d9730e..04fb6c1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java
@@ -28,6 +28,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.Set;
+
import org.apache.http.entity.ContentType;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
@@ -48,8 +49,7 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
-
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
/**
@@ -63,7 +63,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final int id = 1;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
@@ -75,7 +75,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final int id = 2;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
@@ -87,7 +87,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createWithInlineAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final int id = 3;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", true);
@@ -101,7 +101,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createWithInlineAsJSON() {
// this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final int id = 4;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", true);
@@ -114,12 +114,12 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createInlineWithoutLinkAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final int id = 5;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
original.addLink(client.getObjectFactory().newDeepInsertEntity(
- "Info", getSampleCustomerInfo(id, "Sample Customer_Info")));
+ "Info", getSampleCustomerInfo("Sample Customer_Info")));
createEntity(getServiceRoot(), format, original, "Customer");
final ODataEntity actual =
@@ -141,12 +141,12 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createInlineWithoutLinkAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final int id = 6;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
original.addLink(client.getObjectFactory().newDeepInsertEntity(
- "Info", getSampleCustomerInfo(id, "Sample Customer_Info")));
+ "Info", getSampleCustomerInfo("Sample Customer_Info")));
createEntity(getServiceRoot(), format, original, "Customer");
final ODataEntity actual =
@@ -168,7 +168,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createWithNavigationAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final ODataEntity actual = createWithNavigationLink(format, 5);
cleanAfterCreate(format, actual, false, getServiceRoot());
}
@@ -176,14 +176,14 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createWithNavigationAsJSON() {
// this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final ODataEntity actual = createWithNavigationLink(format, 6);
cleanAfterCreate(format, actual, false, getServiceRoot());
}
@Test
public void createWithFeedNavigationAsAtom() throws EdmPrimitiveTypeException {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final ODataEntity actual = createWithFeedNavigationLink(format, 7);
cleanAfterCreate(format, actual, false, getServiceRoot());
}
@@ -191,14 +191,14 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createWithFeedNavigationAsJSON() throws EdmPrimitiveTypeException {
// this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final ODataEntity actual = createWithFeedNavigationLink(format, 8);
cleanAfterCreate(format, actual, false, getServiceRoot());
}
@Test
public void createWithBackNavigationAsAtom() throws EdmPrimitiveTypeException {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final ODataEntity actual = createWithBackNavigationLink(format, 9);
cleanAfterCreate(format, actual, true, getServiceRoot());
}
@@ -206,19 +206,19 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
@Test
public void createWithBackNavigationAsJSON() throws EdmPrimitiveTypeException {
// this needs to be full, otherwise there is no mean to recognize links
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final ODataEntity actual = createWithBackNavigationLink(format, 10);
cleanAfterCreate(format, actual, true, getServiceRoot());
}
@Test
public void multiKeyAsAtom() {
- multiKey(ODataPubFormat.ATOM);
+ multiKey(ODataFormat.ATOM);
}
@Test
public void multiKeyAsJSON() {
- multiKey(ODataPubFormat.JSON);
+ multiKey(ODataFormat.JSON);
}
@Test
@@ -256,7 +256,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Customer");
final ODataEntityCreateRequest<ODataEntity> createReq =
client.getCUDRequestFactory().getEntityCreateRequest(uriBuilder.build(), original);
- createReq.setFormat(ODataPubFormat.JSON_FULL_METADATA);
+ createReq.setFormat(ODataFormat.JSON_FULL_METADATA);
createReq.setContentType(ContentType.APPLICATION_ATOM_XML.getMimeType());
createReq.setPrefer(client.newPreferences().returnContent());
@@ -274,7 +274,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
}
}
- private ODataEntity createWithFeedNavigationLink(final ODataPubFormat format, final int id)
+ private ODataEntity createWithFeedNavigationLink(final ODataFormat format, final int id)
throws EdmPrimitiveTypeException {
final String sampleName = "Sample customer";
@@ -337,7 +337,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
return actual;
}
- private ODataEntity createWithNavigationLink(final ODataPubFormat format, final int id) {
+ private ODataEntity createWithNavigationLink(final ODataFormat format, final int id) {
final String sampleName = "Sample customer";
final ODataEntity original = getSampleCustomerProfile(id, sampleName, false);
@@ -374,7 +374,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
return actual;
}
- private ODataEntity createWithBackNavigationLink(final ODataPubFormat format, final int id)
+ private ODataEntity createWithBackNavigationLink(final ODataFormat format, final int id)
throws EdmPrimitiveTypeException {
final String sampleName = "Sample customer";
@@ -440,7 +440,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
return customer;
}
- private void multiKey(final ODataPubFormat format) {
+ private void multiKey(final ODataFormat format) {
final ODataEntity message = client.getObjectFactory().newEntity(new FullQualifiedName(
"Microsoft.Test.OData.Services.AstoriaDefaultService.Message"));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
index 043e547..832b538 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java
@@ -25,6 +25,7 @@ import static org.junit.Assert.assertTrue;
import java.util.LinkedHashMap;
import java.util.List;
+
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.ODataRawRequest;
@@ -42,7 +43,7 @@ import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
/**
@@ -54,7 +55,7 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
return testStaticServiceRootURL;
}
- private void withInlineEntry(final ODataPubFormat format) {
+ private void withInlineEntry(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Info");
@@ -97,16 +98,16 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void withInlineEntryFromAtom() {
- withInlineEntry(ODataPubFormat.ATOM);
+ withInlineEntry(ODataFormat.ATOM);
}
@Test
public void withInlineEntryFromJSON() {
// this needs to be full, otherwise there is no mean to recognize links
- withInlineEntry(ODataPubFormat.JSON_FULL_METADATA);
+ withInlineEntry(ODataFormat.JSON_FULL_METADATA);
}
- private void withInlineFeed(final ODataPubFormat format) {
+ private void withInlineFeed(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).expand("Orders");
@@ -135,16 +136,16 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void withInlineFeedFromAtom() {
- withInlineFeed(ODataPubFormat.ATOM);
+ withInlineFeed(ODataFormat.ATOM);
}
@Test
public void withInlineFeedFromJSON() {
// this needs to be full, otherwise there is no mean to recognize links
- withInlineFeed(ODataPubFormat.JSON_FULL_METADATA);
+ withInlineFeed(ODataFormat.JSON_FULL_METADATA);
}
- private void rawRequest(final ODataPubFormat format) {
+ private void rawRequest(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Car").appendKeySegment(16);
@@ -163,16 +164,16 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void rawRequestAsAtom() {
- rawRequest(ODataPubFormat.ATOM);
+ rawRequest(ODataFormat.ATOM);
}
@Test
public void rawRequestAsJSON() {
// this needs to be full, otherwise actions will not be provided
- rawRequest(ODataPubFormat.JSON_FULL_METADATA);
+ rawRequest(ODataFormat.JSON_FULL_METADATA);
}
- private void multiKey(final ODataPubFormat format) throws EdmPrimitiveTypeException {
+ private void multiKey(final ODataFormat format) throws EdmPrimitiveTypeException {
final LinkedHashMap<String, Object> multiKey = new LinkedHashMap<String, Object>();
multiKey.put("FromUsername", "1");
multiKey.put("MessageId", -10);
@@ -191,25 +192,25 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void multiKeyAsAtom() throws EdmPrimitiveTypeException {
- multiKey(ODataPubFormat.ATOM);
+ multiKey(ODataFormat.ATOM);
}
@Test
public void multiKeyAsJSON() throws EdmPrimitiveTypeException {
- multiKey(ODataPubFormat.JSON_FULL_METADATA);
+ multiKey(ODataFormat.JSON_FULL_METADATA);
}
@Test
public void checkForETagAsAtom() {
- checkForETag(ODataPubFormat.ATOM);
+ checkForETag(ODataFormat.ATOM);
}
@Test
public void checkForETagAsJSON() {
- checkForETag(ODataPubFormat.JSON_FULL_METADATA);
+ checkForETag(ODataFormat.JSON_FULL_METADATA);
}
- private void checkForETag(final ODataPubFormat format) {
+ private void checkForETag(final ODataFormat format) {
final CommonURIBuilder<?> uriBuilder =
client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Product").appendKeySegment(-10);
@@ -231,14 +232,14 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
final CommonURIBuilder<?> uriBuilder = client.newURIBuilder(getServiceRoot()).appendEntitySetSegment("Car");
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- req.setFormat(ODataPubFormat.JSON);
+ req.setFormat(ODataFormat.JSON);
// this statement should cause an IllegalArgumentException bearing JsonParseException
// since we are attempting to parse an EntitySet as if it was an Entity
req.execute().getBody();
}
- private void geospatial(final ODataPubFormat format) {
+ private void geospatial(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("AllGeoTypesSet").appendKeySegment(-10);
@@ -251,11 +252,11 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
@Test
public void geospatialAsJSON() {
- geospatial(ODataPubFormat.JSON_FULL_METADATA);
+ geospatial(ODataFormat.JSON_FULL_METADATA);
}
@Test
public void geospatialAsAtom() {
- geospatial(ODataPubFormat.ATOM);
+ geospatial(ODataFormat.ATOM);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
index 0f8649c..61acf0a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.net.URI;
+
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest;
@@ -35,7 +36,7 @@ import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
/**
@@ -49,55 +50,55 @@ public class EntitySetTestITCase extends AbstractTestITCase {
@Test
public void rawRequestAsAtom() throws IOException {
- rawRequest(ODataPubFormat.ATOM);
+ rawRequest(ODataFormat.ATOM);
}
@Test
public void rawRequestAsJSON() throws IOException {
- rawRequest(ODataPubFormat.JSON);
+ rawRequest(ODataFormat.JSON);
}
@Test
public void readWithInlineCountAsJSON() throws IOException {
- readWithInlineCount(ODataPubFormat.JSON);
+ readWithInlineCount(ODataFormat.JSON);
}
@Test
public void readWithInlineCountAsAtom() throws IOException {
- readWithInlineCount(ODataPubFormat.ATOM);
+ readWithInlineCount(ODataFormat.ATOM);
}
@Test
public void readODataEntitySetIteratorFromAtom() {
- readODataEntitySetIterator(ODataPubFormat.ATOM);
+ readODataEntitySetIterator(ODataFormat.ATOM);
}
@Test
public void readODataEntitySetIteratorFromJSON() {
- readODataEntitySetIterator(ODataPubFormat.JSON);
+ readODataEntitySetIterator(ODataFormat.JSON);
}
@Test
public void readODataEntitySetIteratorFromJSONFullMeta() {
- readODataEntitySetIterator(ODataPubFormat.JSON_FULL_METADATA);
+ readODataEntitySetIterator(ODataFormat.JSON_FULL_METADATA);
}
@Test
public void readODataEntitySetIteratorFromJSONNoMeta() {
- readODataEntitySetIterator(ODataPubFormat.JSON_NO_METADATA);
+ readODataEntitySetIterator(ODataFormat.JSON_NO_METADATA);
}
@Test
public void readODataEntitySetWithNextFromAtom() {
- readEntitySetWithNextLink(ODataPubFormat.ATOM);
+ readEntitySetWithNextLink(ODataFormat.ATOM);
}
@Test
public void readODataEntitySetWithNextFromJSON() {
- readEntitySetWithNextLink(ODataPubFormat.JSON_FULL_METADATA);
+ readEntitySetWithNextLink(ODataFormat.JSON_FULL_METADATA);
}
- private void readEntitySetWithNextLink(final ODataPubFormat format) {
+ private void readEntitySetWithNextLink(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer");
@@ -121,7 +122,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
assertEquals(expected, found);
}
- private void readODataEntitySetIterator(final ODataPubFormat format) {
+ private void readODataEntitySetIterator(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Customer");
@@ -144,7 +145,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
assertTrue(feedIterator.getNext().toASCIIString().endsWith("Customer?$skiptoken=-9"));
}
- private void readWithInlineCount(final ODataPubFormat format) {
+ private void readWithInlineCount(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Product").inlineCount(URIBuilder.InlineCount.allpages);
@@ -158,7 +159,7 @@ public class EntitySetTestITCase extends AbstractTestITCase {
assertEquals(10, entitySet.getPayload().getCount());
}
- private void rawRequest(final ODataPubFormat format) {
+ private void rawRequest(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot());
uriBuilder.appendEntitySetSegment("Car");
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
index 413dae8..72f4ed7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.fail;
import java.net.URI;
import java.util.LinkedHashMap;
+
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
@@ -33,8 +34,7 @@ import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResp
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
-
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
/**
@@ -48,7 +48,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void mergeAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
@@ -59,7 +59,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void mergeAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
@@ -70,7 +70,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void patchAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
@@ -81,7 +81,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void patchAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Product").appendKeySegment(-10).build();
final String etag = getETag(uri);
@@ -92,7 +92,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void replaceAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final ODataEntity changes = read(format, client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
@@ -100,7 +100,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void replaceAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final ODataEntity changes = read(format, client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
@@ -108,15 +108,15 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
@Test
public void patchLinkAsAtom() throws EdmPrimitiveTypeException {
- patchLink(ODataPubFormat.ATOM);
+ patchLink(ODataFormat.ATOM);
}
@Test
public void patchLinkAsJSON() throws EdmPrimitiveTypeException {
- patchLink(ODataPubFormat.JSON_FULL_METADATA);
+ patchLink(ODataFormat.JSON_FULL_METADATA);
}
- public void patchLink(final ODataPubFormat format) throws EdmPrimitiveTypeException {
+ public void patchLink(final ODataFormat format) throws EdmPrimitiveTypeException {
final URI uri = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-10).build();
@@ -172,7 +172,7 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
// ---------------------------------------
}
- private ODataEntityUpdateRequest<ODataEntity> buildMultiKeyUpdateReq(final ODataPubFormat format)
+ private ODataEntityUpdateRequest<ODataEntity> buildMultiKeyUpdateReq(final ODataFormat format)
throws EdmPrimitiveTypeException {
final LinkedHashMap<String, Object> multiKey = new LinkedHashMap<String, Object>();
@@ -192,19 +192,19 @@ public class EntityUpdateTestITCase extends AbstractTestITCase {
return client.getCUDRequestFactory().getEntityUpdateRequest(UpdateType.MERGE, message);
}
- private void mergeMultiKey(final ODataPubFormat format) throws EdmPrimitiveTypeException {
+ private void mergeMultiKey(final ODataFormat format) throws EdmPrimitiveTypeException {
final ODataEntityUpdateResponse<ODataEntity> res = buildMultiKeyUpdateReq(format).execute();
assertEquals(204, res.getStatusCode());
}
@Test
public void mergeMultiKeyAsAtom() throws EdmPrimitiveTypeException {
- mergeMultiKey(ODataPubFormat.ATOM);
+ mergeMultiKey(ODataFormat.ATOM);
}
@Test
public void mergeMultiKeyAsJSON() throws EdmPrimitiveTypeException {
- mergeMultiKey(ODataPubFormat.JSON_FULL_METADATA);
+ mergeMultiKey(ODataFormat.JSON_FULL_METADATA);
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
index fe8ef61..3781734 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URI;
+
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
@@ -41,7 +42,7 @@ import org.apache.olingo.client.core.communication.response.AbstractODataRespons
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
/**
@@ -50,10 +51,15 @@ import org.junit.Test;
public class ErrorTestITCase extends AbstractTestITCase {
private class ErrorGeneratingRequest
- extends AbstractODataBasicRequest<ODataEntityCreateResponse<ODataEntity>, ODataPubFormat> {
+ extends AbstractODataBasicRequest<ODataEntityCreateResponse<ODataEntity>> {
public ErrorGeneratingRequest(final HttpMethod method, final URI uri) {
- super(client, ODataPubFormat.class, method, uri);
+ super(client, method, uri);
+ }
+
+ @Override
+ public ODataFormat getDefaultFormat() {
+ return odataClient.getConfiguration().getDefaultPubFormat();
}
@Override
@@ -83,7 +89,7 @@ public class ErrorTestITCase extends AbstractTestITCase {
}
}
- private void stacktraceError(final ODataPubFormat format) {
+ private void stacktraceError(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL);
uriBuilder.appendEntitySetSegment("Customer");
@@ -102,15 +108,15 @@ public class ErrorTestITCase extends AbstractTestITCase {
@Test
public void xmlStacktraceError() {
- stacktraceError(ODataPubFormat.ATOM);
+ stacktraceError(ODataFormat.ATOM);
}
@Test
public void jsonStacktraceError() {
- stacktraceError(ODataPubFormat.JSON);
+ stacktraceError(ODataFormat.JSON);
}
- private void notfoundError(final ODataPubFormat format) {
+ private void notfoundError(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL);
uriBuilder.appendEntitySetSegment("Customer(154)");
@@ -130,15 +136,15 @@ public class ErrorTestITCase extends AbstractTestITCase {
@Test
public void xmlNotfoundError() {
- notfoundError(ODataPubFormat.ATOM);
+ notfoundError(ODataFormat.ATOM);
}
@Test
public void jsonNotfoundError() {
- notfoundError(ODataPubFormat.JSON);
+ notfoundError(ODataFormat.JSON);
}
- private void instreamError(final ODataPubFormat format) {
+ private void instreamError(final ODataFormat format) {
final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).
appendOperationCallSegment("InStreamErrorGetCustomer");
final ODataInvokeRequest<ODataEntitySet> req =
@@ -152,11 +158,11 @@ public class ErrorTestITCase extends AbstractTestITCase {
@Test(expected = IllegalArgumentException.class)
public void atomInstreamError() {
- instreamError(ODataPubFormat.ATOM);
+ instreamError(ODataFormat.ATOM);
}
@Test(expected = IllegalArgumentException.class)
public void jsonInstreamError() {
- instreamError(ODataPubFormat.JSON);
+ instreamError(ODataFormat.JSON);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
index 6b8742f..d2edbbe 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java
@@ -29,6 +29,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
@@ -46,12 +47,12 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
public class InvokeTestITCase extends AbstractTestITCase {
- private void getWithNoParams(final ODataPubFormat format) {
+ private void getWithNoParams(final ODataFormat format) {
// 1. get primitive value property
URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
appendOperationCallSegment("GetPrimitiveString");
@@ -83,15 +84,15 @@ public class InvokeTestITCase extends AbstractTestITCase {
@Test
public void getWithNoParamsAsAtom() {
- getWithNoParams(ODataPubFormat.ATOM);
+ getWithNoParams(ODataFormat.ATOM);
}
@Test
public void getWithNoParamsAsJSON() {
- getWithNoParams(ODataPubFormat.JSON);
+ getWithNoParams(ODataFormat.JSON);
}
- private void getWithParams(final ODataPubFormat format) throws EdmPrimitiveTypeException {
+ private void getWithParams(final ODataFormat format) throws EdmPrimitiveTypeException {
// 1. primitive result
URIBuilder builder = getClient().newURIBuilder(testStaticServiceRootURL).
appendOperationCallSegment("GetArgumentPlusOne");
@@ -133,15 +134,15 @@ public class InvokeTestITCase extends AbstractTestITCase {
@Test
public void getWithParamsAsAtom() throws EdmPrimitiveTypeException {
- getWithParams(ODataPubFormat.ATOM);
+ getWithParams(ODataFormat.ATOM);
}
@Test
public void getWithParamsAsJSON() throws EdmPrimitiveTypeException {
- getWithParams(ODataPubFormat.JSON);
+ getWithParams(ODataFormat.JSON);
}
- private ODataEntity createEmployee(final ODataPubFormat format) {
+ private ODataEntity createEmployee(final ODataFormat format) {
final ODataEntity employee = getClient().getObjectFactory().newEntity(new FullQualifiedName(
"Microsoft.Test.OData.Services.AstoriaDefaultService.Employee"));
@@ -169,7 +170,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
return req.execute().getBody();
}
- private void deleteEmployee(final ODataPubFormat format, final Integer id) {
+ private void deleteEmployee(final ODataFormat format, final Integer id) {
final URIBuilder uriBuilder = getClient().newURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Person").appendKeySegment(id);
@@ -182,7 +183,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
@Test
public void boundPost() throws EdmPrimitiveTypeException {
// 0. create an employee
- final ODataEntity created = createEmployee(ODataPubFormat.JSON_FULL_METADATA);
+ final ODataEntity created = createEmployee(ODataFormat.JSON_FULL_METADATA);
assertNotNull(created);
final Integer createdId = created.getProperty("PersonId").getPrimitiveValue().toCastValue(Integer.class);
assertNotNull(createdId);
@@ -192,7 +193,7 @@ public class InvokeTestITCase extends AbstractTestITCase {
final ODataInvokeRequest<ODataNoContent> req = getClient().getInvokeRequestFactory().
getActionInvokeRequest(operation.getTarget(), ODataNoContent.class);
- req.setFormat(ODataPubFormat.JSON_FULL_METADATA);
+ req.setFormat(ODataFormat.JSON_FULL_METADATA);
final ODataInvokeResponse<ODataNoContent> res = req.execute();
assertNotNull(res);
assertEquals(204, res.getStatusCode());
@@ -202,13 +203,13 @@ public class InvokeTestITCase extends AbstractTestITCase {
appendEntitySetSegment("Person").appendKeySegment(createdId);
final ODataEntityRequest<ODataEntity> retrieveRes =
getClient().getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
- retrieveRes.setFormat(ODataPubFormat.JSON_FULL_METADATA);
+ retrieveRes.setFormat(ODataFormat.JSON_FULL_METADATA);
final ODataEntity read = retrieveRes.execute().getBody();
assertEquals("0", read.getProperty("Salary").getPrimitiveValue().toString());
assertTrue(read.getProperty("Title").getPrimitiveValue().toString().endsWith("[Sacked]"));
// 3. remove the test employee
- deleteEmployee(ODataPubFormat.JSON_FULL_METADATA, createdId);
+ deleteEmployee(ODataFormat.JSON_FULL_METADATA, createdId);
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
index 30c2d99..569ea4f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java
@@ -26,7 +26,7 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -38,7 +38,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
client.getConfiguration().setKeyAsSegment(true);
}
- private void read(final ODataPubFormat format) {
+ private void read(final ODataFormat format) {
final URIBuilder uriBuilder = client.newURIBuilder(testKeyAsSegmentServiceRootURL).
appendEntitySetSegment("Customer").appendKeySegment(-10);
@@ -55,17 +55,17 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void fromAtom() {
- read(ODataPubFormat.ATOM);
+ read(ODataFormat.ATOM);
}
@Test
public void fromJSON() {
- read(ODataPubFormat.JSON_FULL_METADATA);
+ read(ODataFormat.JSON_FULL_METADATA);
}
@Test
public void createODataEntityAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final int id = 1;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
@@ -77,7 +77,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void createODataEntityAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final int id = 2;
final ODataEntity original = getSampleCustomerProfile(id, "Sample customer", false);
@@ -89,7 +89,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void replaceODataEntityAsAtom() {
- final ODataPubFormat format = ODataPubFormat.ATOM;
+ final ODataFormat format = ODataFormat.ATOM;
final ODataEntity changes = read(format, client.newURIBuilder(testKeyAsSegmentServiceRootURL).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
@@ -97,7 +97,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void replaceODataEntityAsJSON() {
- final ODataPubFormat format = ODataPubFormat.JSON_FULL_METADATA;
+ final ODataFormat format = ODataFormat.JSON_FULL_METADATA;
final ODataEntity changes = read(format, client.newURIBuilder(testKeyAsSegmentServiceRootURL).
appendEntitySetSegment("Car").appendKeySegment(14).build());
updateEntityDescription(format, changes, UpdateType.REPLACE);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
index 7383c1b..a29c10f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest;
@@ -39,8 +40,7 @@ import org.apache.olingo.client.api.communication.response.ODataStreamUpdateResp
import org.apache.olingo.client.api.uri.v3.URIBuilder;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
-import org.apache.olingo.commons.api.format.ODataMediaFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
public class MediaEntityTestITCase extends AbstractTestITCase {
@@ -51,7 +51,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
- retrieveReq.setFormat(ODataMediaFormat.WILDCARD);
+ retrieveReq.setFormat(ODataFormat.WILDCARD);
final ODataRetrieveResponse<InputStream> retrieveRes = retrieveReq.execute();
assertEquals(200, retrieveRes.getStatusCode());
@@ -66,7 +66,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
- retrieveReq.setFormat(ODataMediaFormat.APPLICATION_XML);
+ retrieveReq.setFormat(ODataFormat.APPLICATION_XML);
retrieveReq.execute();
}
@@ -77,12 +77,12 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(12);
final ODataMediaRequest retrieveReq = client.getRetrieveRequestFactory().getMediaEntityRequest(builder.build());
- retrieveReq.setFormat(ODataMediaFormat.APPLICATION_JSON);
+ retrieveReq.setFormat(ODataFormat.APPLICATION_JSON);
retrieveReq.execute();
}
- private void updateMediaEntity(final ODataPubFormat format, final int id) throws Exception {
+ private void updateMediaEntity(final ODataFormat format, final int id) throws Exception {
final URIBuilder builder =
client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car").appendKeySegment(id);
@@ -106,15 +106,15 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void updateMediaEntityAsAtom() throws Exception {
- updateMediaEntity(ODataPubFormat.ATOM, 14);
+ updateMediaEntity(ODataFormat.ATOM, 14);
}
@Test
public void updateMediaEntityAsJson() throws Exception {
- updateMediaEntity(ODataPubFormat.JSON, 15);
+ updateMediaEntity(ODataFormat.JSON, 15);
}
- private void createMediaEntity(final ODataPubFormat format, final InputStream input) throws Exception {
+ private void createMediaEntity(final ODataFormat format, final InputStream input) throws Exception {
final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment("Car");
final ODataMediaEntityCreateRequest<ODataEntity> createReq =
@@ -148,17 +148,17 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
@Test
public void createMediaEntityAsAtom() throws Exception {
- createMediaEntity(ODataPubFormat.ATOM, IOUtils.toInputStream("buffered stream sample"));
+ createMediaEntity(ODataFormat.ATOM, IOUtils.toInputStream("buffered stream sample"));
}
@Test
public void createMediaEntityAsJson() throws Exception {
- createMediaEntity(ODataPubFormat.JSON, IOUtils.toInputStream("buffered stream sample"));
+ createMediaEntity(ODataFormat.JSON, IOUtils.toInputStream("buffered stream sample"));
}
@Test
public void issue137() throws Exception {
- createMediaEntity(ODataPubFormat.JSON, this.getClass().getResourceAsStream("/sample.png"));
+ createMediaEntity(ODataFormat.JSON, this.getClass().getResourceAsStream("/sample.png"));
}
@Test
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
index 05d8a07..b6b4d53 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.util.Calendar;
import java.util.UUID;
+
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
@@ -35,7 +36,7 @@ import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.EdmSchema;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
public class OpenTypeTestITCase extends AbstractTestITCase {
@@ -52,13 +53,13 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
assertTrue(metadata.getEntityType(new FullQualifiedName(schema.getNamespace(), "RowIndex")).isOpenType());
}
- private ODataEntity readRow(final ODataPubFormat format, final String uuid) {
+ private ODataEntity readRow(final ODataFormat format, final String uuid) {
final URIBuilder builder = getClient().newURIBuilder(testOpenTypeServiceRootURL).
appendEntitySetSegment("Row").appendKeySegment(UUID.fromString(uuid));
return read(format, builder.build());
}
- private void read(final ODataPubFormat format) {
+ private void read(final ODataFormat format) {
ODataEntity row = readRow(format, "71f7d0dc-ede4-45eb-b421-555a2aa1e58f");
assertEquals(EdmPrimitiveTypeKind.Double, row.getProperty("Double").getPrimitiveValue().getTypeKind());
assertEquals(EdmPrimitiveTypeKind.Guid, row.getProperty("Id").getPrimitiveValue().getTypeKind());
@@ -69,15 +70,15 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void readAsAtom() {
- read(ODataPubFormat.ATOM);
+ read(ODataFormat.ATOM);
}
@Test
public void readAsJSON() {
- read(ODataPubFormat.JSON_FULL_METADATA);
+ read(ODataFormat.JSON_FULL_METADATA);
}
- private void cud(final ODataPubFormat format) {
+ private void cud(final ODataFormat format) {
final Integer id = 1426;
ODataEntity rowIndex = getClient().getObjectFactory().newEntity(
@@ -172,11 +173,11 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
@Test
public void cudAsAtom() {
- cud(ODataPubFormat.ATOM);
+ cud(ODataFormat.ATOM);
}
@Test
public void cudAsJSON() {
- cud(ODataPubFormat.JSON_FULL_METADATA);
+ cud(ODataFormat.JSON_FULL_METADATA);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
index 73c7d9d..2b2ec75 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java
@@ -23,16 +23,16 @@ import static org.junit.Assert.assertNotNull;
import java.math.BigDecimal;
import java.util.UUID;
+
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
-
+import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
public class PrimitiveKeysTestITCase extends AbstractTestITCase {
- private void readEntity(final String entityType, final Object key, final ODataPubFormat format) {
+ private void readEntity(final String entityType, final Object key, final ODataFormat format) {
final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(
client.newURIBuilder(testStaticServiceRootURL).appendEntitySetSegment(entityType).
appendKeySegment(key).
@@ -45,7 +45,7 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase {
assertNotNull(entity.getProperty("Id"));
}
- private void readPrimitiveKeys(final ODataPubFormat format) {
+ private void readPrimitiveKeys(final ODataFormat format) {
readEntity("EdmBooleanSet", Boolean.TRUE, format);
readEntity("EdmByteSet", 255, format);
readEntity("EdmDecimalSet", new BigDecimal("79228162514264337593543950335"), format);
@@ -60,11 +60,11 @@ public class PrimitiveKeysTestITCase extends AbstractTestITCase {
@Test
public void readEntityAsAtom() {
- readPrimitiveKeys(ODataPubFormat.ATOM);
+ readPrimitiveKeys(ODataFormat.ATOM);
}
@Test
public void readEntityAsJSON() {
- readPrimitiveKeys(ODataPubFormat.JSON_FULL_METADATA);
+ readPrimitiveKeys(ODataFormat.JSON_FULL_METADATA);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
index e1fa1d4..6866a06 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
+
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest;
@@ -45,7 +46,6 @@ import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
import org.junit.Test;
/**
@@ -59,7 +59,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
@Test
public void replacePropertyValue() throws Exception {
- updatePropertyValue(ODataValueFormat.TEXT, UpdateType.REPLACE);
+ updatePropertyValue(ODataFormat.TEXT_PLAIN, UpdateType.REPLACE);
}
@Test
@@ -128,7 +128,7 @@ public class PropertyTestITCase extends AbstractTestITCase {
uriBuilder.appendEntitySetSegment("Customer").count();
final ODataValueRequest req = client.getRetrieveRequestFactory().getValueRequest(uriBuilder.build());
- req.setFormat(ODataValueFormat.TEXT);
+ req.setFormat(ODataFormat.TEXT_PLAIN);
final ODataRetrieveResponse<ODataPrimitiveValue> res = req.execute();
assertEquals(200, res.getStatusCode());
@@ -159,8 +159,8 @@ public class PropertyTestITCase extends AbstractTestITCase {
execute();
}
- private void updatePropertyValue(final ODataValueFormat format, final UpdateType type)
- throws IOException, EdmPrimitiveTypeException {
+ private void updatePropertyValue(final ODataFormat format, final UpdateType type)
+ throws IOException, EdmPrimitiveTypeException {
final URIBuilder uriBuilder = client.newURIBuilder(getServiceRoot()).
appendEntitySetSegment("Customer").appendKeySegment(-9).