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 2015/04/30 17:02:55 UTC
[42/50] [abbrv] olingo-odata4 git commit: [OLINGO-564] Renamed
'OData*' to 'Client*' classes
[OLINGO-564] Renamed 'OData*' to 'Client*' classes
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/c37d4da5
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/c37d4da5
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/c37d4da5
Branch: refs/heads/master
Commit: c37d4da5710eb7919c601aaae9a80de1ff83cba9
Parents: 53b10f6
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Apr 28 23:11:55 2015 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Apr 28 23:11:55 2015 +0200
----------------------------------------------------------------------
.../AbstractCollectionInvocationHandler.java | 14 +-
...stractEntityCollectionInvocationHandler.java | 26 +-
.../commons/AbstractInvocationHandler.java | 8 +-
.../commons/AbstractPersistenceManager.java | 38 +-
.../AbstractStructuredInvocationHandler.java | 38 +-
.../commons/AnnotatableInvocationHandler.java | 26 +-
.../ComplexCollectionInvocationHandler.java | 22 +-
.../proxy/commons/ComplexInvocationHandler.java | 46 +-
.../EntityContainerInvocationHandler.java | 4 +-
.../proxy/commons/EntityInvocationHandler.java | 44 +-
.../commons/EntitySetInvocationHandler.java | 14 +-
.../ext/proxy/commons/EntitySetIterator.java | 4 +-
.../proxy/commons/InvokerInvocationHandler.java | 38 +-
.../commons/OperationInvocationHandler.java | 18 +-
.../PrimitiveCollectionInvocationHandler.java | 19 +-
...turedComposableInvokerInvocationHandler.java | 4 +-
.../ext/proxy/context/EntityLinkDesc.java | 10 +-
.../olingo/ext/proxy/utils/CoreUtils.java | 94 +--
.../olingo/ext/proxy/utils/ProxyUtils.java | 14 +-
.../olingo/fit/AbstractBaseTestITCase.java | 12 +-
.../fit/tecsvc/client/ActionImportITCase.java | 128 +--
.../BasicHttpExceptionHandlingITCase.java | 2 +-
.../olingo/fit/tecsvc/client/BasicITCase.java | 793 ++++++++++---------
.../fit/tecsvc/client/BatchClientITCase.java | 128 +--
.../olingo/fit/tecsvc/client/BindingITCase.java | 228 +++---
.../fit/tecsvc/client/DeepInsertITCase.java | 255 +++---
.../fit/tecsvc/client/ExpandSelectITCase.java | 72 +-
.../ExpandWithSystemQueryOptionsITCase.java | 290 +++----
.../tecsvc/client/FilterSystemQueryITCase.java | 534 ++++++-------
.../fit/tecsvc/client/FunctionImportITCase.java | 92 +--
.../olingo/fit/tecsvc/client/MediaITCase.java | 32 +-
.../fit/tecsvc/client/NavigationITCase.java | 52 +-
.../tecsvc/client/OrderBySystemQueryITCase.java | 91 +--
.../tecsvc/client/PrimitiveComplexITCase.java | 94 +--
.../tecsvc/client/SystemQueryOptionITCase.java | 49 +-
.../olingo/fit/v4/AbstractTestITCase.java | 76 +-
.../apache/olingo/fit/v4/AsyncTestITCase.java | 63 +-
.../olingo/fit/v4/AuthBatchTestITCase.java | 24 +-
.../apache/olingo/fit/v4/BatchTestITCase.java | 124 +--
.../fit/v4/BoundOperationInvokeTestITCase.java | 208 ++---
.../olingo/fit/v4/ConformanceTestITCase.java | 109 +--
.../apache/olingo/fit/v4/DeltaTestITCase.java | 30 +-
.../olingo/fit/v4/DerivedTypeTestITCase.java | 44 +-
.../olingo/fit/v4/EntityCreateTestITCase.java | 51 +-
.../olingo/fit/v4/EntityRetrieveTestITCase.java | 141 ++--
.../olingo/fit/v4/EntitySetTestITCase.java | 36 +-
.../olingo/fit/v4/EntityUpdateTestITCase.java | 48 +-
.../olingo/fit/v4/ErrorResponseTestITCase.java | 24 +-
.../olingo/fit/v4/FilterFactoryTestITCase.java | 26 +-
.../fit/v4/JSONFormatConformanceTestITCase.java | 222 +++---
.../olingo/fit/v4/KeyAsSegmentTestITCase.java | 49 +-
.../olingo/fit/v4/MediaEntityTestITCase.java | 44 +-
.../olingo/fit/v4/MetadataTestITCase.java | 34 +-
.../apache/olingo/fit/v4/OAuth2TestITCase.java | 35 +-
.../olingo/fit/v4/OpenTypeTestITCase.java | 32 +-
.../fit/v4/OperationImportInvokeTestITCase.java | 160 ++--
.../olingo/fit/v4/PropertyTestITCase.java | 52 +-
.../olingo/fit/v4/PropertyValueTestITCase.java | 36 +-
.../olingo/fit/v4/QueryOptionsTestITCase.java | 83 +-
.../fit/v4/ServiceDocumentTestITCase.java | 22 +-
.../olingo/fit/v4/SingletonTestITCase.java | 43 +-
.../apache/olingo/client/api/ODataClient.java | 4 +-
.../ODataClientErrorException.java | 10 +-
.../request/cud/CUDRequestFactory.java | 35 +-
.../request/cud/ODataEntityCreateRequest.java | 4 +-
.../request/cud/ODataEntityUpdateRequest.java | 4 +-
.../request/invoke/ClientNoContent.java | 28 +
.../invoke/EdmEnabledInvokeRequestFactory.java | 28 +-
.../request/invoke/InvokeRequestFactory.java | 20 +-
.../request/invoke/ODataInvokeRequest.java | 8 +-
.../request/invoke/ODataNoContent.java | 28 -
.../request/retrieve/ODataDeltaRequest.java | 4 +-
.../request/retrieve/ODataEntityRequest.java | 4 +-
.../retrieve/ODataEntitySetIteratorRequest.java | 6 +-
.../request/retrieve/ODataEntitySetRequest.java | 4 +-
.../request/retrieve/ODataPropertyRequest.java | 4 +-
.../retrieve/ODataServiceDocumentRequest.java | 4 +-
.../request/retrieve/ODataValueRequest.java | 4 +-
.../retrieve/RetrieveRequestFactory.java | 18 +-
.../MediaEntityCreateStreamManager.java | 4 +-
.../MediaEntityUpdateStreamManager.java | 4 +-
.../streamed/ODataMediaEntityCreateRequest.java | 4 +-
.../streamed/ODataMediaEntityUpdateRequest.java | 4 +-
.../response/ODataEntityCreateResponse.java | 4 +-
.../response/ODataEntityUpdateResponse.java | 4 +-
.../response/ODataInvokeResponse.java | 4 +-
.../ODataMediaEntityCreateResponse.java | 4 +-
.../ODataMediaEntityUpdateResponse.java | 4 +-
.../response/ODataPropertyUpdateResponse.java | 4 +-
.../response/ODataValueUpdateResponse.java | 4 +-
.../olingo/client/api/data/ServiceDocument.java | 2 +-
.../api/domain/ODataEntitySetIterator.java | 6 +-
.../client/api/serialization/ODataBinder.java | 38 +-
.../client/api/serialization/ODataReader.java | 20 +-
.../client/api/serialization/ODataWriter.java | 14 +-
.../olingo/client/core/ODataClientImpl.java | 8 +-
.../header/ODataErrorResponseChecker.java | 8 +-
.../request/cud/CUDRequestFactoryImpl.java | 34 +-
.../cud/ODataEntityCreateRequestImpl.java | 4 +-
.../cud/ODataEntityUpdateRequestImpl.java | 4 +-
.../cud/ODataPropertyUpdateRequestImpl.java | 10 +-
.../cud/ODataValueUpdateRequestImpl.java | 10 +-
.../AbstractEdmEnabledInvokeRequestFactory.java | 28 +-
.../invoke/AbstractInvokeRequestFactory.java | 34 +-
.../invoke/AbstractODataInvokeRequest.java | 38 +-
.../EdmEnabledInvokeRequestFactoryImpl.java | 8 +-
.../invoke/InvokeRequestFactoryImpl.java | 8 +-
.../request/invoke/ODataInvokeRequestImpl.java | 4 +-
.../request/retrieve/ODataDeltaRequestImpl.java | 10 +-
.../retrieve/ODataEntityRequestImpl.java | 4 +-
.../ODataEntitySetIteratorRequestImpl.java | 6 +-
.../retrieve/ODataEntitySetRequestImpl.java | 4 +-
.../retrieve/ODataPropertyRequestImpl.java | 4 +-
.../ODataServiceDocumentRequestImpl.java | 10 +-
.../request/retrieve/ODataValueRequestImpl.java | 10 +-
.../retrieve/RetrieveRequestFactoryImpl.java | 28 +-
.../ODataMediaEntityCreateRequestImpl.java | 4 +-
.../ODataMediaEntityUpdateRequestImpl.java | 4 +-
.../ClientODataDeserializerImpl.java | 4 +-
.../core/serialization/ODataBinderImpl.java | 174 ++--
.../core/serialization/ODataReaderImpl.java | 36 +-
.../core/serialization/ODataWriterImpl.java | 18 +-
.../apache/olingo/client/core/uri/URIUtils.java | 6 +-
.../olingo/client/core/v4/EntitySetTest.java | 14 +-
.../olingo/client/core/v4/EntityTest.java | 88 +-
.../apache/olingo/client/core/v4/ErrorTest.java | 8 +-
.../apache/olingo/client/core/v4/JSONTest.java | 16 +-
.../client/core/v4/PrimitiveValueTest.java | 6 +-
.../olingo/client/core/v4/PropertyTest.java | 38 +-
.../client/core/v4/ServiceDocumentTest.java | 6 +-
.../apache/olingo/commons/api/data/Entity.java | 6 +-
.../api/domain/AbstractClientPayload.java | 50 ++
.../commons/api/domain/AbstractClientValue.java | 120 +++
.../api/domain/AbstractODataPayload.java | 50 --
.../commons/api/domain/AbstractODataValue.java | 120 ---
.../commons/api/domain/ClientAnnotatable.java | 26 +
.../commons/api/domain/ClientAnnotation.java | 30 +
.../api/domain/ClientCollectionValue.java | 57 ++
.../commons/api/domain/ClientComplexValue.java | 58 ++
.../commons/api/domain/ClientDeletedEntity.java | 36 +
.../olingo/commons/api/domain/ClientDelta.java | 31 +
.../commons/api/domain/ClientDeltaLink.java | 36 +
.../olingo/commons/api/domain/ClientEntity.java | 202 +++++
.../commons/api/domain/ClientEntitySet.java | 71 ++
.../commons/api/domain/ClientEnumValue.java | 27 +
.../olingo/commons/api/domain/ClientError.java | 132 +++
.../commons/api/domain/ClientErrorDetail.java | 73 ++
.../commons/api/domain/ClientInlineEntity.java | 68 ++
.../api/domain/ClientInlineEntitySet.java | 69 ++
.../commons/api/domain/ClientInvokeResult.java | 30 +
.../olingo/commons/api/domain/ClientItem.java | 96 +++
.../olingo/commons/api/domain/ClientLink.java | 187 +++++
.../commons/api/domain/ClientLinkType.java | 105 +++
.../olingo/commons/api/domain/ClientLinked.java | 70 ++
.../commons/api/domain/ClientObjectFactory.java | 168 ++++
.../commons/api/domain/ClientOperation.java | 85 ++
.../api/domain/ClientPrimitiveValue.java | 88 ++
.../commons/api/domain/ClientProperty.java | 32 +
.../commons/api/domain/ClientPropertyType.java | 44 +
.../api/domain/ClientServiceDocument.java | 163 ++++
.../commons/api/domain/ClientSingleton.java | 23 +
.../commons/api/domain/ClientValuable.java | 94 +++
.../olingo/commons/api/domain/ClientValue.java | 91 +++
.../commons/api/domain/ODataAnnotatable.java | 26 -
.../commons/api/domain/ODataAnnotation.java | 30 -
.../api/domain/ODataCollectionValue.java | 57 --
.../commons/api/domain/ODataComplexValue.java | 58 --
.../commons/api/domain/ODataDeletedEntity.java | 36 -
.../olingo/commons/api/domain/ODataDelta.java | 31 -
.../commons/api/domain/ODataDeltaLink.java | 36 -
.../olingo/commons/api/domain/ODataEntity.java | 202 -----
.../commons/api/domain/ODataEntitySet.java | 71 --
.../commons/api/domain/ODataEnumValue.java | 27 -
.../olingo/commons/api/domain/ODataError.java | 132 ---
.../commons/api/domain/ODataErrorDetail.java | 73 --
.../commons/api/domain/ODataInlineEntity.java | 68 --
.../api/domain/ODataInlineEntitySet.java | 69 --
.../commons/api/domain/ODataInvokeResult.java | 30 -
.../olingo/commons/api/domain/ODataItem.java | 96 ---
.../olingo/commons/api/domain/ODataLink.java | 187 -----
.../commons/api/domain/ODataLinkType.java | 105 ---
.../olingo/commons/api/domain/ODataLinked.java | 70 --
.../commons/api/domain/ODataObjectFactory.java | 168 ----
.../commons/api/domain/ODataOperation.java | 85 --
.../commons/api/domain/ODataPrimitiveValue.java | 88 --
.../commons/api/domain/ODataProperty.java | 32 -
.../commons/api/domain/ODataPropertyType.java | 44 -
.../api/domain/ODataServiceDocument.java | 163 ----
.../commons/api/domain/ODataSingleton.java | 23 -
.../commons/api/domain/ODataValuable.java | 94 ---
.../olingo/commons/api/domain/ODataValue.java | 91 ---
.../EdmConstantAnnotationExpression.java | 4 +-
.../api/serialization/ODataDeserializer.java | 4 +-
.../core/domain/AbstractClientEntitySet.java | 71 ++
.../core/domain/AbstractODataEntitySet.java | 71 --
.../core/domain/ClientAnnotationImpl.java | 102 +++
.../core/domain/ClientCollectionValueImpl.java | 124 +++
.../core/domain/ClientComplexValueImpl.java | 204 +++++
.../core/domain/ClientDeletedEntityImpl.java | 54 ++
.../commons/core/domain/ClientDeltaImpl.java | 60 ++
.../core/domain/ClientDeltaLinkImpl.java | 78 ++
.../commons/core/domain/ClientEntityImpl.java | 298 +++++++
.../core/domain/ClientEntitySetImpl.java | 65 ++
.../core/domain/ClientEnumValueImpl.java | 59 ++
.../core/domain/ClientObjectFactoryImpl.java | 155 ++++
.../core/domain/ClientPrimitiveValueImpl.java | 222 ++++++
.../commons/core/domain/ClientPropertyImpl.java | 163 ++++
.../commons/core/domain/ClientValuableImpl.java | 111 +++
.../core/domain/ODataAnnotationImpl.java | 102 ---
.../core/domain/ODataCollectionValueImpl.java | 124 ---
.../core/domain/ODataComplexValueImpl.java | 204 -----
.../core/domain/ODataDeletedEntityImpl.java | 54 --
.../commons/core/domain/ODataDeltaImpl.java | 60 --
.../commons/core/domain/ODataDeltaLinkImpl.java | 78 --
.../commons/core/domain/ODataEntityImpl.java | 298 -------
.../commons/core/domain/ODataEntitySetImpl.java | 65 --
.../commons/core/domain/ODataEnumValueImpl.java | 59 --
.../core/domain/ODataObjectFactoryImpl.java | 155 ----
.../core/domain/ODataPrimitiveValueImpl.java | 222 ------
.../commons/core/domain/ODataPropertyImpl.java | 163 ----
.../commons/core/domain/ODataValuableImpl.java | 111 ---
.../EdmConstantAnnotationExpressionImpl.java | 26 +-
.../core/serialization/AtomDeserializer.java | 46 +-
.../core/serialization/AtomSerializer.java | 4 +-
.../core/serialization/JsonDeserializer.java | 46 +-
.../serialization/JsonEntityDeserializer.java | 8 +-
.../serialization/JsonEntitySerializer.java | 4 +-
.../JsonODataErrorDeserializer.java | 10 +-
.../JsonODataErrorDetailDeserializer.java | 8 +-
.../core/serialization/JsonSerializer.java | 8 +-
.../olingo/server/api/ClientServerError.java | 138 ++++
.../olingo/server/api/ODataServerError.java | 138 ----
.../server/api/processor/DefaultProcessor.java | 4 +-
.../server/api/processor/ErrorProcessor.java | 4 +-
.../server/api/serializer/ODataSerializer.java | 4 +-
.../apache/olingo/server/core/ErrorHandler.java | 26 +-
.../server/core/responses/EntityResponse.java | 4 +-
.../core/responses/EntitySetResponse.java | 4 +-
.../server/core/responses/MetadataResponse.java | 4 +-
.../server/core/responses/PropertyResponse.java | 4 +-
.../server/core/responses/ResponseUtil.java | 6 +-
.../core/responses/ServiceDocumentResponse.java | 4 +-
.../server/core/ODataExceptionHelper.java | 50 +-
.../apache/olingo/server/core/ODataHandler.java | 24 +-
.../server/core/ODataHttpHandlerImpl.java | 4 +-
.../json/ODataJsonDeserializer.java | 10 +-
.../serializer/json/ODataErrorSerializer.java | 8 +-
.../serializer/json/ODataJsonSerializer.java | 4 +-
.../serializer/xml/ODataXmlSerializerImpl.java | 4 +-
.../json/ClientErrorSerializerTest.java | 136 ++++
.../json/ODataErrorSerializerTest.java | 136 ----
.../olingo/server/tecsvc/data/DataCreator.java | 6 +-
.../olingo/server/core/ODataHandlerTest.java | 4 +-
.../json/ODataDeserializerDeepInsertTest.java | 6 +-
.../json/ODataJsonDeserializerEntityTest.java | 6 +-
255 files changed, 7699 insertions(+), 7655 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java
index 3f75544..276d6e4 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java
@@ -35,7 +35,7 @@ import org.apache.commons.lang3.tuple.Triple;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.uri.URIFilter;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.EntityType;
@@ -59,7 +59,7 @@ public abstract class AbstractCollectionInvocationHandler<T extends Serializable
protected final Class<T> itemRef;
- protected final List<ODataAnnotation> annotations = new ArrayList<ODataAnnotation>();
+ protected final List<ClientAnnotation> annotations = new ArrayList<ClientAnnotation>();
private final Map<Class<? extends AbstractTerm>, Object> annotationsByTerm =
new HashMap<Class<? extends AbstractTerm>, Object>();
@@ -92,7 +92,7 @@ public abstract class AbstractCollectionInvocationHandler<T extends Serializable
public Collection<T> execute() {
if (this.uri != null) {
- final Triple<List<T>, URI, List<ODataAnnotation>> res = fetchPartial(this.uri.build(), itemRef);
+ final Triple<List<T>, URI, List<ClientAnnotation>> res = fetchPartial(this.uri.build(), itemRef);
this.nextPageURI = res.getMiddle();
if (items == null) {
@@ -109,9 +109,9 @@ public abstract class AbstractCollectionInvocationHandler<T extends Serializable
return this;
}
- public abstract Triple<List<T>, URI, List<ODataAnnotation>> fetchPartial(final URI uri, final Class<T> typeRef);
+ public abstract Triple<List<T>, URI, List<ClientAnnotation>> fetchPartial(final URI uri, final Class<T> typeRef);
- public void setAnnotations(final List<ODataAnnotation> annotations) {
+ public void setAnnotations(final List<ClientAnnotation> annotations) {
this.annotations.clear();
this.annotationsByTerm.clear();
this.annotations.addAll(annotations);
@@ -145,8 +145,8 @@ public abstract class AbstractCollectionInvocationHandler<T extends Serializable
try {
final Term termAnn = term.getAnnotation(Term.class);
final Namespace namespaceAnn = term.getAnnotation(Namespace.class);
- ODataAnnotation annotation = null;
- for (ODataAnnotation _annotation : annotations) {
+ ClientAnnotation annotation = null;
+ for (ClientAnnotation _annotation : annotations) {
if ((namespaceAnn.value() + "." + termAnn.name()).equals(_annotation.getTerm())) {
annotation = _annotation;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
index 01e5843..90309c5 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
@@ -30,10 +30,10 @@ import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataEntitySet;
-import org.apache.olingo.commons.api.domain.ODataSingleton;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
+import org.apache.olingo.commons.api.domain.ClientSingleton;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -93,27 +93,27 @@ public abstract class AbstractEntityCollectionInvocationHandler<T extends Entity
@SuppressWarnings("unchecked")
@Override
- public Triple<List<T>, URI, List<ODataAnnotation>> fetchPartial(
+ public Triple<List<T>, URI, List<ClientAnnotation>> fetchPartial(
final URI uri, final Class<T> typeRef) {
- final List<ODataEntity> entities = new ArrayList<ODataEntity>();
+ final List<ClientEntity> entities = new ArrayList<ClientEntity>();
final URI next;
- final List<ODataAnnotation> anns = new ArrayList<ODataAnnotation>();
+ final List<ClientAnnotation> anns = new ArrayList<ClientAnnotation>();
if (isSingleton) {
- final ODataRetrieveResponse<ODataSingleton> res =
+ final ODataRetrieveResponse<ClientSingleton> res =
((ODataClient) getClient()).getRetrieveRequestFactory().getSingletonRequest(uri).execute();
entities.add(res.getBody());
next = null;
} else {
- final ODataEntitySetRequest<ODataEntitySet> req =
+ final ODataEntitySetRequest<ClientEntitySet> req =
getClient().getRetrieveRequestFactory().getEntitySetRequest(uri);
req.setPrefer(getClient().newPreferences().includeAnnotations("*"));
- final ODataRetrieveResponse<ODataEntitySet> res = req.execute();
+ final ODataRetrieveResponse<ClientEntitySet> res = req.execute();
- final ODataEntitySet entitySet = res.getBody();
+ final ClientEntitySet entitySet = res.getBody();
entities.addAll(entitySet.getEntities());
next = entitySet.getNext();
anns.addAll(entitySet.getAnnotations());
@@ -121,7 +121,7 @@ public abstract class AbstractEntityCollectionInvocationHandler<T extends Entity
final List<T> res = new ArrayList<T>(entities.size());
- for (ODataEntity entity : entities) {
+ for (ClientEntity entity : entities) {
Class<?> actualRef = null;
if (entity.getTypeName() != null) {
actualRef = service.getEntityTypeClass(entity.getTypeName().toString());
@@ -150,6 +150,6 @@ public abstract class AbstractEntityCollectionInvocationHandler<T extends Entity
handlerInTheContext == null ? handler : handlerInTheContext));
}
- return new ImmutableTriple<List<T>, URI, List<ODataAnnotation>>(res, next, anns);
+ return new ImmutableTriple<List<T>, URI, List<ClientAnnotation>>(res, next, anns);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
index abc0ee8..a1005a3 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java
@@ -32,8 +32,8 @@ import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.ComplexType;
@@ -94,7 +94,7 @@ abstract class AbstractInvocationHandler implements InvocationHandler {
protected ComplexType<?> getComplex(
final String name,
- final ODataValue value,
+ final ClientValue value,
final Class<?> ref,
final EntityInvocationHandler handler,
final URI baseURI,
@@ -153,7 +153,7 @@ abstract class AbstractInvocationHandler implements InvocationHandler {
final String namespace = handler.getUUID().getType().getAnnotation(Namespace.class).value();
- final ODataEntity template;
+ final ClientEntity template;
final URI entityURI;
if (handler.getEntityURI() == null || handler.getUUID().getKey() == null) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 06c190a..d29aad4 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
@@ -40,9 +40,9 @@ import org.apache.olingo.client.api.communication.request.cud.ODataReferenceAddi
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest;
import org.apache.olingo.client.core.uri.URIUtils;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataLink;
-import org.apache.olingo.commons.api.domain.ODataLinkType;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientLink;
+import org.apache.olingo.commons.api.domain.ClientLinkType;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
@@ -118,8 +118,8 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
service.getContext().detachAll();
}
- private ODataLink buildNavigationLink(final String name, final URI uri, final ODataLinkType type) {
- ODataLink result;
+ private ClientLink buildNavigationLink(final String name, final URI uri, final ClientLinkType type) {
+ ClientLink result;
switch (type) {
case ENTITY_NAVIGATION:
@@ -146,7 +146,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
int posNumber = pos;
items.put(handler, null);
- final ODataEntity entity = handler.getEntity();
+ final ClientEntity entity = handler.getEntity();
entity.getNavigationLinks().clear();
final AttachedEntityStatus currentStatus = service.getContext().entityContext().getStatus(handler);
@@ -166,13 +166,13 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
}
for (Map.Entry<NavigationProperty, Object> property : handler.getLinkChanges().entrySet()) {
- final ODataLinkType type = Collection.class.isAssignableFrom(property.getValue().getClass())
- ? ODataLinkType.ENTITY_SET_NAVIGATION
- : ODataLinkType.ENTITY_NAVIGATION;
+ final ClientLinkType type = Collection.class.isAssignableFrom(property.getValue().getClass())
+ ? ClientLinkType.ENTITY_SET_NAVIGATION
+ : ClientLinkType.ENTITY_NAVIGATION;
final Set<EntityInvocationHandler> toBeLinked = new HashSet<EntityInvocationHandler>();
- for (Object proxy : type == ODataLinkType.ENTITY_SET_NAVIGATION
+ for (Object proxy : type == ClientLinkType.ENTITY_SET_NAVIGATION
? (Collection<?>) property.getValue() : Collections.singleton(property.getValue())) {
final EntityInvocationHandler target = (EntityInvocationHandler) Proxy.getInvocationHandler(proxy);
@@ -312,7 +312,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
posNumber++;
items.put(delayedUpdate.getSource(), posNumber);
- final ODataEntity changes =
+ final ClientEntity changes =
service.getClient().getObjectFactory().newEntity(delayedUpdate.getSource().getEntity().getTypeName());
AttachedEntityStatus status = service.getContext().entityContext().getStatus(delayedUpdate.getSource());
@@ -339,7 +339,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
targetURI = URI.create("$" + targetPos);
}
- changes.addLink(delayedUpdate.getType() == ODataLinkType.ENTITY_NAVIGATION
+ changes.addLink(delayedUpdate.getType() == ClientLinkType.ENTITY_NAVIGATION
? service.getClient().getObjectFactory().
newEntityNavigationLink(delayedUpdate.getSourceName(), targetURI)
: service.getClient().getObjectFactory().
@@ -366,7 +366,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
private AttachedEntityStatus queue(
final EntityInvocationHandler handler,
- final ODataEntity entity,
+ final ClientEntity entity,
final PersistenceChanges changeset) {
switch (service.getContext().entityContext().getStatus(handler)) {
@@ -390,7 +390,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
private void queueCreate(
final EntityInvocationHandler handler,
- final ODataEntity entity,
+ final ClientEntity entity,
final PersistenceChanges changeset) {
LOG.debug("Create '{}'", handler);
@@ -445,12 +445,12 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
private void queueUpdate(
final EntityInvocationHandler handler,
- final ODataEntity changes,
+ final ClientEntity changes,
final PersistenceChanges changeset) {
LOG.debug("Update '{}'", handler.getEntityURI());
- final ODataEntityUpdateRequest<ODataEntity> req =
+ final ODataEntityUpdateRequest<ClientEntity> req =
((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
getEntityUpdateRequest(handler.getEntityURI(),
org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes);
@@ -490,12 +490,12 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
private void queueUpdate(
final EntityInvocationHandler handler,
final URI uri,
- final ODataEntity changes,
+ final ClientEntity changes,
final PersistenceChanges changeset) {
LOG.debug("Update '{}'", uri);
- final ODataEntityUpdateRequest<ODataEntity> req =
+ final ODataEntityUpdateRequest<ClientEntity> req =
((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
getEntityUpdateRequest(uri,
org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes);
@@ -511,7 +511,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
private void queueDelete(
final EntityInvocationHandler handler,
- final ODataEntity entity,
+ final ClientEntity entity,
final PersistenceChanges changeset) {
final URI deleteURI = entity.getEditLink() == null ? handler.getEntityURI() : entity.getEditLink();
changeset.addChange(buildDeleteRequest(deleteURI, handler.getETag()), handler);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
index e1b735e..0795e8b 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
@@ -41,13 +41,13 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.uri.URIUtils;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataInlineEntity;
-import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
-import org.apache.olingo.commons.api.domain.ODataLink;
-import org.apache.olingo.commons.api.domain.ODataLinked;
-import org.apache.olingo.commons.api.domain.ODataProperty;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientInlineEntity;
+import org.apache.olingo.commons.api.domain.ClientInlineEntitySet;
+import org.apache.olingo.commons.api.domain.ClientLink;
+import org.apache.olingo.commons.api.domain.ClientLinked;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.ext.proxy.AbstractService;
@@ -309,7 +309,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
} else if (propertyCache.containsKey(name)) {
res = propertyCache.get(name);
} else {
- final ODataProperty property = getInternalProperty(name);
+ final ClientProperty property = getInternalProperty(name);
if (ref != null && ClassUtils.getTypeClass(type).isAnnotationPresent(ComplexType.class)) {
res = getComplex(
@@ -332,7 +332,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
} else {
List items = new ArrayList();
- for (ODataValue item : property.getValue().asCollection()) {
+ for (ClientValue item : property.getValue().asCollection()) {
items.add(getComplex(
name,
item,
@@ -364,7 +364,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
? null : getClient().newURIBuilder(baseURI.toASCIIString()).appendPropertySegment(name));
} else {
List items = new ArrayList();
- for (ODataValue item : property.getValue().asCollection()) {
+ for (ClientValue item : property.getValue().asCollection()) {
items.add(item.asPrimitive().toValue());
}
collectionHandler = new PrimitiveCollectionInvocationHandler(
@@ -450,25 +450,25 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
final Object navPropValue;
URI targetEntitySetURI = CoreUtils.getTargetEntitySetURI(getClient(), property);
- final ODataLink link = ((ODataLinked) internal).getNavigationLink(property.name());
+ final ClientLink link = ((ClientLinked) internal).getNavigationLink(property.name());
- if (link instanceof ODataInlineEntity) {
+ if (link instanceof ClientInlineEntity) {
// return entity
navPropValue = ProxyUtils.getEntityProxy(
service,
- ((ODataInlineEntity) link).getEntity(),
+ ((ClientInlineEntity) link).getEntity(),
targetEntitySetURI,
type,
null,
false);
- } else if (link instanceof ODataInlineEntitySet) {
+ } else if (link instanceof ClientInlineEntitySet) {
// return entity set
navPropValue = ProxyUtils.getEntityCollectionProxy(
service,
collItemType,
type,
targetEntitySetURI,
- ((ODataInlineEntitySet) link).getEntitySet(),
+ ((ClientInlineEntitySet) link).getEntitySet(),
targetEntitySetURI,
false);
} else {
@@ -494,7 +494,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
EntityInvocationHandler handler = getContext().entityContext().getEntity(uuid);
if (handler == null) {
- final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
+ final ClientEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
collItemType.getAnnotation(Namespace.class).value(), ClassUtils.getEntityTypeName(collItemType)));
handler = EntityInvocationHandler.getInstance(
@@ -543,7 +543,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
}
}
- for (ODataProperty property : getInternalProperties()) {
+ for (ClientProperty property : getInternalProperties()) {
if (!propertyNames.contains(property.getName())) {
res.add(property.getName());
}
@@ -644,7 +644,7 @@ public abstract class AbstractStructuredInvocationHandler extends AbstractInvoca
public abstract boolean isChanged();
- protected abstract <T extends ODataProperty> List<T> getInternalProperties();
+ protected abstract <T extends ClientProperty> List<T> getInternalProperties();
- protected abstract ODataProperty getInternalProperty(final String name);
+ protected abstract ClientProperty getInternalProperty(final String name);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
index 9da95ff..4b66898 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java
@@ -27,9 +27,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
-import org.apache.olingo.commons.api.domain.ODataComplexValue;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
+import org.apache.olingo.commons.api.domain.ClientComplexValue;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.Annotatable;
@@ -77,17 +77,17 @@ public class AnnotatableInvocationHandler extends AbstractInvocationHandler impl
return annotations;
}
- private List<ODataAnnotation> internalAnnotations() {
- List<ODataAnnotation> result = Collections.<ODataAnnotation> emptyList();
+ private List<ClientAnnotation> internalAnnotations() {
+ List<ClientAnnotation> result = Collections.<ClientAnnotation> emptyList();
- if (targetHandler.getInternal() instanceof ODataEntity) {
+ if (targetHandler.getInternal() instanceof ClientEntity) {
result = propName == null
- ? ((ODataEntity) targetHandler.getInternal()).getNavigationLink(navPropName).getAnnotations()
- : ((ODataEntity) targetHandler.getInternal()).getProperty(propName).getAnnotations();
- } else if (targetHandler.getInternal() instanceof ODataComplexValue) {
+ ? ((ClientEntity) targetHandler.getInternal()).getNavigationLink(navPropName).getAnnotations()
+ : ((ClientEntity) targetHandler.getInternal()).getProperty(propName).getAnnotations();
+ } else if (targetHandler.getInternal() instanceof ClientComplexValue) {
result = propName == null
- ? ((ODataComplexValue) targetHandler.getInternal()).getNavigationLink(navPropName).getAnnotations()
- : ((ODataComplexValue) targetHandler.getInternal()).get(propName).getAnnotations();
+ ? ((ClientComplexValue) targetHandler.getInternal()).getNavigationLink(navPropName).getAnnotations()
+ : ((ClientComplexValue) targetHandler.getInternal()).get(propName).getAnnotations();
}
return result;
@@ -146,8 +146,8 @@ public class AnnotatableInvocationHandler extends AbstractInvocationHandler impl
try {
final Term termAnn = term.getAnnotation(Term.class);
final Namespace namespaceAnn = term.getAnnotation(Namespace.class);
- ODataAnnotation annotation = null;
- for (ODataAnnotation _annotation : internalAnnotations()) {
+ ClientAnnotation annotation = null;
+ for (ClientAnnotation _annotation : internalAnnotations()) {
if ((namespaceAnn.value() + "." + termAnn.name()).equals(_annotation.getTerm())) {
annotation = _annotation;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
index fc46c80..1607cfe 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexCollectionInvocationHandler.java
@@ -33,10 +33,10 @@ import org.apache.commons.lang3.tuple.Triple;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
-import org.apache.olingo.commons.api.domain.ODataCollectionValue;
-import org.apache.olingo.commons.api.domain.ODataProperty;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
+import org.apache.olingo.commons.api.domain.ClientCollectionValue;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.ComplexCollection;
import org.apache.olingo.ext.proxy.api.ComplexType;
@@ -96,18 +96,18 @@ public class ComplexCollectionInvocationHandler<T extends ComplexType<?>>
@SuppressWarnings("unchecked")
@Override
- public Triple<List<T>, URI, List<ODataAnnotation>> fetchPartial(final URI uri, final Class<T> typeRef) {
- final ODataPropertyRequest<ODataProperty> req =
+ public Triple<List<T>, URI, List<ClientAnnotation>> fetchPartial(final URI uri, final Class<T> typeRef) {
+ final ODataPropertyRequest<ClientProperty> req =
getClient().getRetrieveRequestFactory().getPropertyRequest(uri);
req.setPrefer(getClient().newPreferences().includeAnnotations("*"));
- final ODataRetrieveResponse<ODataProperty> res = req.execute();
+ final ODataRetrieveResponse<ClientProperty> res = req.execute();
final List<T> resItems = new ArrayList<T>();
- final ODataProperty property = res.getBody();
+ final ClientProperty property = res.getBody();
if (property != null && property.hasCollectionValue()) {
- for (ODataValue item : (ODataCollectionValue<ODataValue>) property.getValue()) {
+ for (ClientValue item : (ClientCollectionValue<ClientValue>) property.getValue()) {
Class<?> actualRef = null;
if (StringUtils.isNotBlank(item.getTypeName())) {
actualRef = service.getComplexTypeClass(item.getTypeName());
@@ -120,7 +120,7 @@ public class ComplexCollectionInvocationHandler<T extends ComplexType<?>>
}
}
- return new ImmutableTriple<List<T>, URI, List<ODataAnnotation>>(
- resItems, null, Collections.<ODataAnnotation> emptyList());
+ return new ImmutableTriple<List<T>, URI, List<ClientAnnotation>>(
+ resItems, null, Collections.<ClientAnnotation> emptyList());
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
index 2e1deb6..16467c2 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java
@@ -28,9 +28,9 @@ import org.apache.commons.lang3.tuple.Pair;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.domain.ODataComplexValue;
-import org.apache.olingo.commons.api.domain.ODataLinked;
-import org.apache.olingo.commons.api.domain.ODataProperty;
+import org.apache.olingo.commons.api.domain.ClientComplexValue;
+import org.apache.olingo.commons.api.domain.ClientLinked;
+import org.apache.olingo.commons.api.domain.ClientProperty;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
@@ -39,7 +39,7 @@ import org.apache.olingo.ext.proxy.utils.ClassUtils;
public class ComplexInvocationHandler extends AbstractStructuredInvocationHandler {
- private static Pair<ODataComplexValue, Class<?>> init(
+ private static Pair<ClientComplexValue, Class<?>> init(
final Class<?> typeRef,
final AbstractService<?> service) {
@@ -57,10 +57,10 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
final FullQualifiedName typeName =
new FullQualifiedName(ClassUtils.getNamespace(complexTypeRef), annotation.name());
- final ODataComplexValue complex =
+ final ClientComplexValue complex =
service.getClient().getObjectFactory().newComplexValue(typeName.toString());
- return new ImmutablePair<ODataComplexValue, Class<?>>(complex, complexTypeRef);
+ return new ImmutablePair<ClientComplexValue, Class<?>>(complex, complexTypeRef);
}
public static ComplexInvocationHandler getInstance(
@@ -68,12 +68,12 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
final EntityInvocationHandler handler,
final Class<?> typeRef) {
- final Pair<ODataComplexValue, Class<?>> init = init(typeRef, handler.service);
+ final Pair<ClientComplexValue, Class<?>> init = init(typeRef, handler.service);
return new ComplexInvocationHandler(init.getLeft(), init.getRight(), handler);
}
public static ComplexInvocationHandler getInstance(
- final ODataComplexValue complex,
+ final ClientComplexValue complex,
final Class<?> typeRef,
final AbstractService<?> service) {
@@ -84,7 +84,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
final Class<?> typeRef,
final AbstractService<?> service) {
- final Pair<ODataComplexValue, Class<?>> init = init(typeRef, service);
+ final Pair<ClientComplexValue, Class<?>> init = init(typeRef, service);
return new ComplexInvocationHandler(init.getLeft(), init.getRight(), service);
}
@@ -93,12 +93,12 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
final AbstractService<?> service,
final URIBuilder uri) {
- final Pair<ODataComplexValue, Class<?>> init = init(typeRef, service);
+ final Pair<ClientComplexValue, Class<?>> init = init(typeRef, service);
return new ComplexInvocationHandler(init.getLeft(), init.getRight(), service, uri);
}
public static ComplexInvocationHandler getInstance(
- final ODataComplexValue complex,
+ final ClientComplexValue complex,
final Class<?> typeRef,
final AbstractService<?> service,
final URIBuilder uri) {
@@ -107,7 +107,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
}
private ComplexInvocationHandler(
- final ODataComplexValue complex,
+ final ClientComplexValue complex,
final Class<?> typeRef,
final AbstractService<?> service,
final URIBuilder uri) {
@@ -118,7 +118,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
}
private ComplexInvocationHandler(
- final ODataComplexValue complex,
+ final ClientComplexValue complex,
final Class<?> typeRef,
final EntityInvocationHandler handler) {
@@ -127,7 +127,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
}
private ComplexInvocationHandler(
- final ODataComplexValue complex,
+ final ClientComplexValue complex,
final Class<?> typeRef,
final AbstractService<?> service) {
@@ -135,13 +135,13 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
this.uri = null;
}
- public ODataComplexValue getComplex() {
- return (ODataComplexValue) this.internal;
+ public ClientComplexValue getComplex() {
+ return (ClientComplexValue) this.internal;
}
@Override
protected Object getNavigationPropertyValue(final NavigationProperty property, final Method getter) {
- if (!(internal instanceof ODataLinked)) {
+ if (!(internal instanceof ClientLinked)) {
throw new UnsupportedOperationException("Internal object is not navigable");
}
@@ -157,10 +157,10 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
protected void load() {
try {
if (this.uri != null) {
- final ODataPropertyRequest<ODataProperty> req =
+ final ODataPropertyRequest<ClientProperty> req =
getClient().getRetrieveRequestFactory().getPropertyRequest(uri.build());
- final ODataRetrieveResponse<ODataProperty> res = req.execute();
+ final ODataRetrieveResponse<ClientProperty> res = req.execute();
this.internal = res.getBody().getValue();
}
} catch (IllegalArgumentException e) {
@@ -173,10 +173,10 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
}
@Override
- protected List<ODataProperty> getInternalProperties() {
- final List<ODataProperty> res = new ArrayList<ODataProperty>();
+ protected List<ClientProperty> getInternalProperties() {
+ final List<ClientProperty> res = new ArrayList<ClientProperty>();
if (getComplex() != null) {
- for (ODataProperty property : getComplex()) {
+ for (ClientProperty property : getComplex()) {
res.add(property);
}
}
@@ -184,7 +184,7 @@ public class ComplexInvocationHandler extends AbstractStructuredInvocationHandle
}
@Override
- protected ODataProperty getInternalProperty(final String name) {
+ protected ClientProperty getInternalProperty(final String name) {
return getComplex() == null ? null : getComplex().get(name);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 ffb5902..b903fdb 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
@@ -25,7 +25,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.URI;
import org.apache.commons.lang3.ArrayUtils;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.ComplexCollection;
@@ -120,7 +120,7 @@ public final class EntityContainerInvocationHandler extends AbstractInvocationHa
EntityInvocationHandler handler = getContext().entityContext().getEntity(uuid);
if (handler == null) {
- final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
+ final ClientEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
typeRef.getAnnotation(Namespace.class).value(), ClassUtils.getEntityTypeName(typeRef)));
handler = EntityInvocationHandler.getInstance(entity, uri, uri, typeRef, service);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 d3d7476..fff16b4 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
@@ -34,9 +34,9 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe
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.commons.api.domain.ODataAnnotation;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataProperty;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientProperty;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.ext.proxy.AbstractService;
@@ -63,7 +63,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
private EntityUUID uuid;
static EntityInvocationHandler getInstance(
- final ODataEntity entity,
+ final ClientEntity entity,
final EntitySetInvocationHandler<?, ?, ?> entitySet,
final Class<?> typeRef) {
@@ -77,7 +77,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
static EntityInvocationHandler getInstance(
final Object key,
- final ODataEntity entity,
+ final ClientEntity entity,
final URI entitySetURI,
final Class<?> typeRef,
final AbstractService<?> service) {
@@ -86,7 +86,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
}
public static EntityInvocationHandler getInstance(
- final ODataEntity entity,
+ final ClientEntity entity,
final URI entitySetURI,
final Class<?> typeRef,
final AbstractService<?> service) {
@@ -95,7 +95,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
}
public static EntityInvocationHandler getInstance(
- final ODataEntity entity,
+ final ClientEntity entity,
final URI entitySetURI,
final URI entityURI,
final Class<?> typeRef,
@@ -129,7 +129,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
final String namespace = typeRef.getAnnotation(Namespace.class).value();
this.internal = service.getClient().getObjectFactory().newEntity(new FullQualifiedName(namespace, name));
- ODataEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
+ ClientEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
this.uuid = new EntityUUID(null, typeRef, null);
}
@@ -145,7 +145,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
final String namespace = typeRef.getAnnotation(Namespace.class).value();
this.internal = service.getClient().getObjectFactory().newEntity(new FullQualifiedName(namespace, name));
- ODataEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
+ ClientEntity.class.cast(this.internal).setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
this.baseURI = entityURI;
this.uri = entityURI == null ? null : getClient().newURIBuilder(baseURI.toASCIIString());
@@ -154,7 +154,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
}
private EntityInvocationHandler(
- final ODataEntity entity,
+ final ClientEntity entity,
final URI entitySetURI,
final URI entityURI,
final Class<?> typeRef,
@@ -177,7 +177,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
private EntityInvocationHandler(
final Object entityKey,
- final ODataEntity entity,
+ final ClientEntity entity,
final URI entitySetURI,
final Class<?> typeRef,
final AbstractService<?> service) {
@@ -207,7 +207,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
this.uuid = new EntityUUID(entitySetURI, typeRef, key);
}
- public void setEntity(final ODataEntity entity) {
+ public void setEntity(final ClientEntity entity) {
this.internal = entity;
getEntity().setMediaEntity(typeRef.getAnnotation(EntityType.class).hasStream());
@@ -240,7 +240,7 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
return uuid;
}
- public EntityUUID updateEntityUUID(final URI entitySetURI, final Class<?> type, final ODataEntity entity) {
+ public EntityUUID updateEntityUUID(final URI entitySetURI, final Class<?> type, final ClientEntity entity) {
CoreUtils.addProperties(service.getClient(), this.getPropertyChanges(), entity);
final Object key = CoreUtils.getKey(getClient(), this, this.getUUID().getType(), entity);
return updateUUID(entitySetURI, type, key);
@@ -266,8 +266,8 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
return uuid.getEntitySetURI();
}
- public final ODataEntity getEntity() {
- return (ODataEntity) internal;
+ public final ClientEntity getEntity() {
+ return (ClientEntity) internal;
}
public URI getEntityURI() {
@@ -414,8 +414,8 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
try {
final Term termAnn = term.getAnnotation(Term.class);
final Namespace namespaceAnn = term.getAnnotation(Namespace.class);
- ODataAnnotation annotation = null;
- for (ODataAnnotation _annotation : getEntity().getAnnotations()) {
+ ClientAnnotation annotation = null;
+ for (ClientAnnotation _annotation : getEntity().getAnnotations()) {
if ((namespaceAnn.value() + "." + termAnn.name()).equals(_annotation.getTerm())) {
annotation = _annotation;
}
@@ -445,14 +445,14 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
final Object key = uuid.getKey();
try {
- final ODataEntityRequest<ODataEntity> req =
+ final ODataEntityRequest<ClientEntity> req =
getClient().getRetrieveRequestFactory().getEntityRequest(uri.build());
req.setPrefer(getClient().newPreferences().includeAnnotations("*"));
- final ODataRetrieveResponse<ODataEntity> res = req.execute();
+ final ODataRetrieveResponse<ClientEntity> res = req.execute();
- final ODataEntity entity = res.getBody();
+ final ClientEntity entity = res.getBody();
if (entity == null) {
throw new IllegalArgumentException("Invalid " + typeRef.getSimpleName() + "(" + key + ")");
}
@@ -479,12 +479,12 @@ public class EntityInvocationHandler extends AbstractStructuredInvocationHandler
@Override
@SuppressWarnings("unchecked")
- protected <T extends ODataProperty> List<T> getInternalProperties() {
+ protected <T extends ClientProperty> List<T> getInternalProperties() {
return getEntity() == null ? Collections.<T> emptyList() : (List<T>) getEntity().getProperties();
}
@Override
- protected ODataProperty getInternalProperty(final String name) {
+ protected ClientProperty getInternalProperty(final String name) {
return getEntity() == null ? null : getEntity().getProperty(name);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/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 2f943d6..950b0ff 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
@@ -30,8 +30,8 @@ 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.commons.api.domain.ODataAnnotation;
-import org.apache.olingo.commons.api.domain.ODataEntity;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
+import org.apache.olingo.commons.api.domain.ClientEntity;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.ext.proxy.AbstractService;
@@ -128,7 +128,7 @@ public class EntitySetInvocationHandler<
EntityInvocationHandler handler = getContext().entityContext().getEntity(uuid);
if (handler == null) {
- final ODataEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
+ final ClientEntity entity = getClient().getObjectFactory().newEntity(new FullQualifiedName(
typeRef.getAnnotation(Namespace.class).value(), ClassUtils.getEntityTypeName(typeRef)));
handler = EntityInvocationHandler.getInstance(key, entity, this.baseURI, typeRef, service);
@@ -175,9 +175,9 @@ public class EntitySetInvocationHandler<
ClassUtils.getNamespace(ref), ClassUtils.getEntityTypeName(ref)).toString());
}
- final List<ODataAnnotation> anns = new ArrayList<ODataAnnotation>();
+ final List<ClientAnnotation> anns = new ArrayList<ClientAnnotation>();
- final Triple<List<T>, URI, List<ODataAnnotation>> entitySet = fetchPartial(uri.build(), (Class<T>) ref);
+ final Triple<List<T>, URI, List<ClientAnnotation>> entitySet = fetchPartial(uri.build(), (Class<T>) ref);
anns.addAll(entitySet.getRight());
final EntityCollectionInvocationHandler<S> entityCollectionHandler = new EntityCollectionInvocationHandler<S>(
@@ -212,11 +212,11 @@ public class EntitySetInvocationHandler<
final URIBuilder uriBuilder, final Class<S> typeRef, final Class<SEC> collTypeRef) {
final List<S> res = new ArrayList<S>();
- final List<ODataAnnotation> anns = new ArrayList<ODataAnnotation>();
+ final List<ClientAnnotation> anns = new ArrayList<ClientAnnotation>();
URI nextURI = uriBuilder.build();
while (nextURI != null) {
- final Triple<List<T>, URI, List<ODataAnnotation>> entitySet = fetchPartial(nextURI, (Class<T>) typeRef);
+ final Triple<List<T>, URI, List<ClientAnnotation>> entitySet = fetchPartial(nextURI, (Class<T>) typeRef);
res.addAll((List<S>) entitySet.getLeft());
nextURI = entitySet.getMiddle();
anns.addAll(entitySet.getRight());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java
index 60ff883..9bbeeb0 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.NoSuchElementException;
import org.apache.commons.lang3.tuple.Triple;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
import org.apache.olingo.ext.proxy.api.EntityCollection;
import org.apache.olingo.ext.proxy.api.EntityType;
@@ -81,7 +81,7 @@ class EntitySetIterator<T extends EntityType<?>, KEY extends Serializable, EC ex
}
private void goOn() {
- final Triple<List<T>, URI, List<ODataAnnotation>> entitySet = esi.fetchPartial(this.next, this.esi.getTypeRef());
+ final Triple<List<T>, URI, List<ClientAnnotation>> entitySet = esi.fetchPartial(this.next, this.esi.getTypeRef());
this.current = entitySet.getLeft().iterator();
this.next = entitySet.getMiddle();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
index 44a2d30..733391c 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/InvokerInvocationHandler.java
@@ -30,15 +30,15 @@ import java.util.concurrent.Future;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent;
+import org.apache.olingo.client.api.communication.request.invoke.ClientNoContent;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.uri.URIFilter;
import org.apache.olingo.client.core.uri.URIUtils;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataEntitySet;
-import org.apache.olingo.commons.api.domain.ODataInvokeResult;
-import org.apache.olingo.commons.api.domain.ODataProperty;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientEntitySet;
+import org.apache.olingo.commons.api.domain.ClientInvokeResult;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.edm.EdmFunction;
import org.apache.olingo.commons.api.edm.EdmOperation;
import org.apache.olingo.commons.api.edm.EdmReturnType;
@@ -63,7 +63,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
private URIBuilder uri;
- private final Map<String, ODataValue> parameters;
+ private final Map<String, ClientValue> parameters;
private final Operation operation;
@@ -75,7 +75,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
public InvokerInvocationHandler(
final URI uri,
- final Map<String, ODataValue> parameters,
+ final Map<String, ClientValue> parameters,
final Operation operation,
final EdmOperation edmOperation,
final Type[] references,
@@ -120,7 +120,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
}
// 2. invoke
- final ODataInvokeResult result = service.getClient().getInvokeRequestFactory().getInvokeRequest(
+ final ClientInvokeResult result = service.getClient().getInvokeRequestFactory().getInvokeRequest(
edmOperation instanceof EdmFunction ? HttpMethod.GET : HttpMethod.POST,
uri.build(),
getResultReference(edmOperation.getReturnType()),
@@ -143,13 +143,13 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
collItemType,
targetRef,
null,
- (ODataEntitySet) result,
+ (ClientEntitySet) result,
this.baseURI,
false);
} else {
return (T) ProxyUtils.getEntityProxy(
service,
- (ODataEntity) result,
+ (ClientEntity) result,
null,
targetRef,
null,
@@ -159,7 +159,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
Object res;
final Class<?> ref = ClassUtils.getTypeClass(targetRef);
- final ODataProperty property = (ODataProperty) result;
+ final ClientProperty property = (ClientProperty) result;
if (property == null || property.hasNullValue()) {
res = null;
@@ -168,7 +168,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
final Class<?> itemRef = ClassUtils.extractTypeArg(ref, ComplexCollection.class);
final List items = new ArrayList();
- for (ODataValue item : property.getValue().asCollection()) {
+ for (ClientValue item : property.getValue().asCollection()) {
items.add(ProxyUtils.getComplexProxy(
service,
property.getName(),
@@ -189,7 +189,7 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
} else {
final List items = new ArrayList();
- for (ODataValue item : property.getValue().asCollection()) {
+ for (ClientValue item : property.getValue().asCollection()) {
items.add(item.asPrimitive().toValue());
}
@@ -218,18 +218,18 @@ public class InvokerInvocationHandler<T, O extends Operations> extends AbstractI
}
@SuppressWarnings("unchecked")
- private <RES extends ODataInvokeResult> Class<RES> getResultReference(final EdmReturnType returnType) {
+ private <RES extends ClientInvokeResult> Class<RES> getResultReference(final EdmReturnType returnType) {
Class<RES> result;
if (returnType == null) {
- result = (Class<RES>) ODataNoContent.class;
+ result = (Class<RES>) ClientNoContent.class;
} else {
if (returnType.isCollection() && returnType.getType().getKind() == EdmTypeKind.ENTITY) {
- result = (Class<RES>) ODataEntitySet.class;
+ result = (Class<RES>) ClientEntitySet.class;
} else if (!returnType.isCollection() && returnType.getType().getKind() == EdmTypeKind.ENTITY) {
- result = (Class<RES>) ODataEntity.class;
+ result = (Class<RES>) ClientEntity.class;
} else {
- result = (Class<RES>) ODataProperty.class;
+ result = (Class<RES>) ClientProperty.class;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
index 73daaf3..d92d39e 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java
@@ -30,9 +30,9 @@ import java.util.List;
import java.util.Map;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.domain.ODataEntity;
-import org.apache.olingo.commons.api.domain.ODataOperation;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientEntity;
+import org.apache.olingo.commons.api.domain.ClientOperation;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.edm.EdmAction;
import org.apache.olingo.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.commons.api.edm.EdmEntityType;
@@ -171,7 +171,7 @@ final class OperationInvocationHandler extends AbstractInvocationHandler {
throw new IllegalStateException("Invalid target invocation");
}
- final Map<String, ODataValue> parameterValues = new LinkedHashMap<String, ODataValue>();
+ final Map<String, ClientValue> parameterValues = new LinkedHashMap<String, ClientValue>();
for (Map.Entry<Parameter, Object> parameter : parameters.entrySet()) {
if (!parameter.getKey().nullable() && parameter.getValue() == null) {
throw new IllegalArgumentException(
@@ -181,7 +181,7 @@ final class OperationInvocationHandler extends AbstractInvocationHandler {
final EdmTypeInfo parameterType = new EdmTypeInfo.Builder().
setEdm(service.getClient().getCachedEdm()).setTypeExpression(parameter.getKey().type()).build();
- final ODataValue paramValue = parameter.getValue() == null
+ final ClientValue paramValue = parameter.getValue() == null
? null
: CoreUtils.getODataValue(service.getClient(), parameterType, parameter.getValue());
@@ -239,10 +239,10 @@ final class OperationInvocationHandler extends AbstractInvocationHandler {
}
private Map.Entry<URI, EdmOperation> getBoundOperation(final Operation operation, final List<String> parameterNames) {
- final ODataEntity entity = EntityInvocationHandler.class.cast(target).getEntity();
+ final ClientEntity entity = EntityInvocationHandler.class.cast(target).getEntity();
final URI entityURI = EntityInvocationHandler.class.cast(target).getEntityURI();
- ODataOperation boundOp = entity.getOperation(operation.name());
+ ClientOperation boundOp = entity.getOperation(operation.name());
if (boundOp == null) {
boundOp = entity.getOperation(new FullQualifiedName(targetFQN.getNamespace(), operation.name()).toString());
}
@@ -261,7 +261,7 @@ final class OperationInvocationHandler extends AbstractInvocationHandler {
if (action == null) {
baseType = baseType.getBaseType();
} else {
- boundOp = new ODataOperation();
+ boundOp = new ClientOperation();
boundOp.setMetadataAnchor(action.getFullQualifiedName().toString());
boundOp.setTitle(boundOp.getMetadataAnchor());
boundOp.setTarget(URI.create(entityURI.toASCIIString() + "/"
@@ -279,7 +279,7 @@ final class OperationInvocationHandler extends AbstractInvocationHandler {
if (func == null) {
baseType = baseType.getBaseType();
} else {
- boundOp = new ODataOperation();
+ boundOp = new ClientOperation();
boundOp.setMetadataAnchor(func.getFullQualifiedName().toString());
boundOp.setTitle(boundOp.getMetadataAnchor());
boundOp.setTarget(URI.create(entityURI.toASCIIString() + "/"
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java
index e5f4e5a..e40593d 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PrimitiveCollectionInvocationHandler.java
@@ -34,8 +34,9 @@ import org.apache.commons.lang3.tuple.Triple;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.URIBuilder;
-import org.apache.olingo.commons.api.domain.ODataAnnotation;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientProperty;
+import org.apache.olingo.commons.api.domain.ClientAnnotation;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
@@ -90,24 +91,24 @@ public class PrimitiveCollectionInvocationHandler<T extends Serializable>
@Override
@SuppressWarnings("unchecked")
- public Triple<List<T>, URI, List<ODataAnnotation>> fetchPartial(final URI uri, final Class<T> typeRef) {
- final ODataPropertyRequest<org.apache.olingo.commons.api.domain.ODataProperty> req =
+ public Triple<List<T>, URI, List<ClientAnnotation>> fetchPartial(final URI uri, final Class<T> typeRef) {
+ final ODataPropertyRequest<ClientProperty> req =
getClient().getRetrieveRequestFactory().getPropertyRequest(uri);
req.setPrefer(getClient().newPreferences().includeAnnotations("*"));
- final ODataRetrieveResponse<org.apache.olingo.commons.api.domain.ODataProperty> res = req.execute();
+ final ODataRetrieveResponse<ClientProperty> res = req.execute();
final List<T> resItems = new ArrayList<T>();
- final org.apache.olingo.commons.api.domain.ODataProperty property = res.getBody();
+ final ClientProperty property = res.getBody();
if (property != null && !property.hasNullValue()) {
- for (ODataValue item : property.getCollectionValue()) {
+ for (ClientValue item : property.getCollectionValue()) {
resItems.add((T) item.asPrimitive().toValue());
}
}
- return new ImmutableTriple<List<T>, URI, List<ODataAnnotation>>(
- resItems, null, Collections.<ODataAnnotation>emptyList());
+ return new ImmutableTriple<List<T>, URI, List<ClientAnnotation>>(
+ resItems, null, Collections.<ClientAnnotation>emptyList());
}
public void delete() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java
index c909ab0..2ca7b86 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/StructuredComposableInvokerInvocationHandler.java
@@ -24,7 +24,7 @@ import java.net.URI;
import java.util.Map;
import org.apache.commons.lang3.ArrayUtils;
-import org.apache.olingo.commons.api.domain.ODataValue;
+import org.apache.olingo.commons.api.domain.ClientValue;
import org.apache.olingo.commons.api.edm.EdmOperation;
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
import org.apache.olingo.ext.proxy.AbstractService;
@@ -38,7 +38,7 @@ public class StructuredComposableInvokerInvocationHandler<T, O extends Operation
public StructuredComposableInvokerInvocationHandler(
final URI uri,
- final Map<String, ODataValue> parameters,
+ final Map<String, ClientValue> parameters,
final Operation operation,
final EdmOperation edmOperation,
final Type[] references,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/c37d4da5/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java
index 5a53181..1506655 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java
@@ -22,7 +22,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.olingo.commons.api.domain.ODataLinkType;
+import org.apache.olingo.commons.api.domain.ClientLinkType;
import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler;
import java.io.Serializable;
@@ -39,7 +39,7 @@ public class EntityLinkDesc implements Serializable {
private final Collection<EntityInvocationHandler> targets;
- private final ODataLinkType type;
+ private final ClientLinkType type;
private final String reference;
@@ -47,7 +47,7 @@ public class EntityLinkDesc implements Serializable {
final String sourceName,
final EntityInvocationHandler source,
final Collection<EntityInvocationHandler> target,
- final ODataLinkType type) {
+ final ClientLinkType type) {
this.sourceName = sourceName;
this.source = source;
this.targets = target;
@@ -59,7 +59,7 @@ public class EntityLinkDesc implements Serializable {
final String sourceName,
final EntityInvocationHandler source,
final EntityInvocationHandler target,
- final ODataLinkType type) {
+ final ClientLinkType type) {
this.sourceName = sourceName;
this.source = source;
this.targets = Collections.<EntityInvocationHandler>singleton(target);
@@ -90,7 +90,7 @@ public class EntityLinkDesc implements Serializable {
return targets;
}
- public ODataLinkType getType() {
+ public ClientLinkType getType() {
return type;
}