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/07/22 15:19:57 UTC
[3/3] git commit: [OLINGO-356] Code clean up (warnings)
[OLINGO-356] Code clean up (warnings)
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/66097e3d
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/66097e3d
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/66097e3d
Branch: refs/heads/master
Commit: 66097e3dd60ac0bfe9918912075e599d1d9c325c
Parents: 7189033
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Jul 22 15:11:34 2014 +0200
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Jul 22 15:11:34 2014 +0200
----------------------------------------------------------------------
.../batch/CommonBatchRequestFactory.java | 4 +-
.../request/cud/CommonCUDRequestFactory.java | 9 ++-
.../request/invoke/InvokeRequestFactory.java | 9 ++-
.../request/invoke/ODataNoContent.java | 7 +--
.../retrieve/CommonRetrieveRequestFactory.java | 8 +--
.../client/api/uri/CommonFilterFactory.java | 4 +-
.../request/batch/AbstractBatchManager.java | 8 +--
.../batch/AbstractBatchRequestFactory.java | 2 -
.../batch/v3/BatchRequestFactoryImpl.java | 2 -
.../request/batch/v3/ODataBatchRequestImpl.java | 15 +++--
.../batch/v4/BatchRequestFactoryImpl.java | 2 -
.../request/cud/AbstractCUDRequestFactory.java | 2 -
.../request/cud/v3/CUDRequestFactoryImpl.java | 5 +-
.../request/cud/v4/CUDRequestFactoryImpl.java | 9 +--
.../AbstractEdmEnabledInvokeRequestFactory.java | 2 -
.../invoke/AbstractInvokeRequestFactory.java | 2 -
.../v3/EdmEnabledInvokeRequestFactoryImpl.java | 2 -
.../invoke/v3/InvokeRequestFactoryImpl.java | 2 -
.../v4/EdmEnabledInvokeRequestFactoryImpl.java | 2 -
.../invoke/v4/InvokeRequestFactoryImpl.java | 2 -
.../AbstractRetrieveRequestFactory.java | 2 -
.../retrieve/v3/RetrieveRequestFactoryImpl.java | 6 +-
.../retrieve/v4/RetrieveRequestFactoryImpl.java | 3 -
.../request/v4/AsyncRequestFactoryImpl.java | 2 -
.../olingo/client/core/edm/EdmEnumTypeImpl.java | 17 +++--
.../olingo/client/core/edm/EdmPropertyImpl.java | 9 ++-
.../client/core/edm/EdmReturnTypeImpl.java | 4 +-
.../client/core/edm/EdmTypeDefinitionImpl.java | 7 +--
.../core/edm/v3/EdmFunctionImportProxy.java | 4 --
.../core/edm/v3/EdmNavigationPropertyProxy.java | 3 -
.../core/edm/v4/annotation/EdmRecordImpl.java | 3 -
.../core/edm/xml/AbstractAnnotations.java | 2 -
.../core/edm/xml/AbstractComplexType.java | 2 -
.../core/edm/xml/AbstractDataServices.java | 2 -
.../client/core/edm/xml/AbstractEdmx.java | 2 -
.../core/edm/xml/AbstractEntityContainer.java | 2 -
.../client/core/edm/xml/AbstractEntitySet.java | 2 -
.../client/core/edm/xml/AbstractEntityType.java | 2 -
.../client/core/edm/xml/AbstractEnumType.java | 2 -
.../client/core/edm/xml/AbstractMember.java | 2 -
.../edm/xml/AbstractNavigationProperty.java | 2 -
.../client/core/edm/xml/AbstractParameter.java | 2 -
.../client/core/edm/xml/AbstractProperty.java | 2 -
.../client/core/edm/xml/AbstractSchema.java | 2 -
.../core/edm/xml/AbstractXMLMetadata.java | 2 -
.../edm/xml/EntityContainerDeserializer.java | 1 -
.../client/core/edm/xml/EntityKeyImpl.java | 2 -
.../client/core/edm/xml/OnDeleteImpl.java | 2 -
.../client/core/edm/xml/PropertyRefImpl.java | 2 -
.../client/core/edm/xml/SchemaDeserializer.java | 1 -
.../client/core/edm/xml/v3/AnnotationsImpl.java | 2 -
.../core/edm/xml/v3/AssociationEndImpl.java | 2 -
.../client/core/edm/xml/v3/AssociationImpl.java | 2 -
.../core/edm/xml/v3/AssociationSetEndImpl.java | 2 -
.../core/edm/xml/v3/AssociationSetImpl.java | 2 -
.../client/core/edm/xml/v3/ComplexTypeImpl.java | 7 +--
.../core/edm/xml/v3/DataServicesImpl.java | 2 -
.../olingo/client/core/edm/xml/v3/EdmxImpl.java | 2 -
.../core/edm/xml/v3/EntityContainerImpl.java | 2 -
.../client/core/edm/xml/v3/EntitySetImpl.java | 3 -
.../client/core/edm/xml/v3/EntityTypeImpl.java | 2 -
.../client/core/edm/xml/v3/EnumTypeImpl.java | 2 -
.../core/edm/xml/v3/FunctionImportImpl.java | 2 -
.../client/core/edm/xml/v3/MemberImpl.java | 3 -
.../core/edm/xml/v3/NavigationPropertyImpl.java | 2 -
.../client/core/edm/xml/v3/ParameterImpl.java | 2 -
.../client/core/edm/xml/v3/PropertyImpl.java | 2 -
.../core/edm/xml/v3/PropertyValueImpl.java | 2 -
.../edm/xml/v3/ReferentialConstraintImpl.java | 2 -
.../xml/v3/ReferentialConstraintRoleImpl.java | 2 -
.../client/core/edm/xml/v3/SchemaImpl.java | 11 ++--
.../core/edm/xml/v3/TypeAnnotationImpl.java | 2 -
.../client/core/edm/xml/v3/UsingImpl.java | 2 -
.../core/edm/xml/v3/ValueAnnotationImpl.java | 2 -
.../client/core/edm/xml/v3/ValueTermImpl.java | 2 -
.../client/core/edm/xml/v3/XMLMetadataImpl.java | 2 -
.../core/edm/xml/v4/AbstractAnnotatable.java | 2 -
.../client/core/edm/xml/v4/ActionImpl.java | 2 -
.../core/edm/xml/v4/ActionImportImpl.java | 2 -
.../client/core/edm/xml/v4/AnnotationImpl.java | 2 -
.../client/core/edm/xml/v4/AnnotationsImpl.java | 2 -
.../client/core/edm/xml/v4/ComplexTypeImpl.java | 2 -
.../core/edm/xml/v4/DataServicesImpl.java | 2 -
.../olingo/client/core/edm/xml/v4/EdmxImpl.java | 2 -
.../core/edm/xml/v4/EntityContainerImpl.java | 11 ++--
.../client/core/edm/xml/v4/EntitySetImpl.java | 2 -
.../client/core/edm/xml/v4/EntityTypeImpl.java | 2 -
.../client/core/edm/xml/v4/EnumTypeImpl.java | 2 -
.../client/core/edm/xml/v4/FunctionImpl.java | 2 -
.../core/edm/xml/v4/FunctionImportImpl.java | 2 -
.../core/edm/xml/v4/IncludeAnnotationsImpl.java | 2 -
.../client/core/edm/xml/v4/IncludeImpl.java | 2 -
.../client/core/edm/xml/v4/MemberImpl.java | 2 -
.../xml/v4/NavigationPropertyBindingImpl.java | 2 -
.../core/edm/xml/v4/NavigationPropertyImpl.java | 2 -
.../client/core/edm/xml/v4/ParameterImpl.java | 2 -
.../client/core/edm/xml/v4/PropertyImpl.java | 2 -
.../client/core/edm/xml/v4/ReferenceImpl.java | 2 -
.../edm/xml/v4/ReferentialConstraintImpl.java | 2 -
.../client/core/edm/xml/v4/ReturnTypeImpl.java | 2 -
.../client/core/edm/xml/v4/SchemaImpl.java | 2 -
.../client/core/edm/xml/v4/SingletonImpl.java | 2 -
.../olingo/client/core/edm/xml/v4/TermImpl.java | 2 -
.../core/edm/xml/v4/TypeDefinitionImpl.java | 2 -
.../client/core/edm/xml/v4/XMLMetadataImpl.java | 2 -
...tAnnotatableDynamicAnnotationExpression.java | 2 -
.../AbstractAnnotationExpression.java | 2 -
.../AbstractDynamicAnnotationExpression.java | 2 -
.../AbstractElementOrAttributeExpression.java | 2 -
.../xml/v4/annotation/AnnotationPathImpl.java | 3 -
.../core/edm/xml/v4/annotation/ApplyImpl.java | 2 -
.../core/edm/xml/v4/annotation/CastImpl.java | 2 -
.../edm/xml/v4/annotation/CollectionImpl.java | 2 -
.../ConstantAnnotationExpressionImpl.java | 2 -
.../core/edm/xml/v4/annotation/IfImpl.java | 2 -
.../core/edm/xml/v4/annotation/IsOfImpl.java | 2 -
.../xml/v4/annotation/LabeledElementImpl.java | 2 -
.../annotation/LabeledElementReferenceImpl.java | 3 -
.../annotation/NavigationPropertyPathImpl.java | 3 -
.../core/edm/xml/v4/annotation/NotImpl.java | 2 -
.../core/edm/xml/v4/annotation/NullImpl.java | 3 -
.../core/edm/xml/v4/annotation/PathImpl.java | 3 -
.../edm/xml/v4/annotation/PropertyPathImpl.java | 3 -
.../xml/v4/annotation/PropertyValueImpl.java | 2 -
.../core/edm/xml/v4/annotation/RecordImpl.java | 2 -
...ParamsOpDynamicAnnotationExpressionImpl.java | 2 -
.../core/edm/xml/v4/annotation/UrlRefImpl.java | 2 -
.../core/http/BasicAuthHttpClientFactory.java | 2 -
.../core/http/DefaultHttpClientFactory.java | 2 -
.../core/http/NTLMAuthHttpClientFactory.java | 6 +-
.../client/core/uri/AbstractFilterFactory.java | 2 -
.../client/core/uri/AbstractURIBuilder.java | 1 -
.../client/core/uri/v3/FilterFactoryImpl.java | 2 -
.../client/core/uri/v4/FilterFactoryImpl.java | 2 -
.../olingo/client/core/ODataClientTest.java | 2 +-
.../olingo/client/core/v4/EntityTest.java | 11 ++--
.../api/domain/AbstractODataPayload.java | 2 -
.../commons/api/domain/AbstractODataValue.java | 4 +-
.../commons/api/domain/CommonODataProperty.java | 4 +-
.../commons/api/domain/ODataInlineEntity.java | 2 -
.../api/domain/ODataInlineEntitySet.java | 2 -
.../olingo/commons/api/domain/ODataItem.java | 9 +--
.../olingo/commons/api/domain/ODataLink.java | 2 -
.../commons/api/domain/ODataOperation.java | 5 +-
.../olingo/commons/api/domain/ODataValue.java | 4 +-
.../olingo/commons/api/domain/v4/ODataLink.java | 2 -
.../domain/AbstractODataCollectionValue.java | 2 -
.../core/domain/AbstractODataComplexValue.java | 2 -
.../core/domain/AbstractODataEntity.java | 2 -
.../core/domain/AbstractODataEntitySet.java | 2 -
.../domain/AbstractODataPrimitiveValue.java | 2 -
.../core/domain/AbstractODataProperty.java | 2 -
.../domain/v3/ODataCollectionValueImpl.java | 2 -
.../core/domain/v3/ODataComplexValueImpl.java | 2 -
.../commons/core/domain/v3/ODataEntityImpl.java | 2 -
.../core/domain/v3/ODataEntitySetImpl.java | 2 -
.../core/domain/v3/ODataPrimitiveValueImpl.java | 2 -
.../core/domain/v3/ODataPropertyImpl.java | 2 -
.../domain/v4/ODataCollectionValueImpl.java | 2 -
.../core/domain/v4/ODataComplexValueImpl.java | 2 -
.../core/domain/v4/ODataDeletedEntityImpl.java | 2 -
.../commons/core/domain/v4/ODataDeltaImpl.java | 2 -
.../core/domain/v4/ODataDeltaLinkImpl.java | 2 -
.../commons/core/domain/v4/ODataEntityImpl.java | 13 ++--
.../core/domain/v4/ODataEntitySetImpl.java | 2 -
.../core/domain/v4/ODataEnumValueImpl.java | 2 -
.../core/domain/v4/ODataPrimitiveValueImpl.java | 2 -
.../core/domain/v4/ODataPropertyImpl.java | 2 -
.../core/edm/AbstractEdmNavigationProperty.java | 4 +-
.../core/edm/provider/EdmEnumTypeImpl.java | 9 ++-
.../core/edm/provider/EdmPropertyImpl.java | 7 +--
.../edm/provider/EdmTypeDefinitionImpl.java | 7 +--
lib/server-tecsvc/src/main/version/version.html | 41 +++++-------
.../src/main/webapp/css/olingo.css | 5 +-
lib/server-tecsvc/src/main/webapp/index.jsp | 66 +++++++-------------
.../olingo/server/tecsvc/data/StringHelper.java | 2 +
.../server/core/uri/UriResourceImplTest.java | 2 +-
.../queryoption/expression/ExpressionTest.java | 2 +-
.../core/uri/testutil/FilterValidator.java | 2 +-
179 files changed, 137 insertions(+), 510 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/CommonBatchRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/CommonBatchRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/CommonBatchRequestFactory.java
index 623bb8e..27b723a 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/CommonBatchRequestFactory.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/CommonBatchRequestFactory.java
@@ -18,12 +18,10 @@
*/
package org.apache.olingo.client.api.communication.request.batch;
-import java.io.Serializable;
-
/**
* OData batch request factory class.
*/
-public interface CommonBatchRequestFactory extends Serializable {
+public interface CommonBatchRequestFactory {
/**
* Gets a batch request object instance.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
index 23c47d7..a03e05e 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java
@@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.api.communication.request.cud;
+import java.io.InputStream;
+import java.net.URI;
+
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest;
@@ -25,16 +28,12 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.net.URI;
-
/**
* OData request factory class.
*
* @param <UT> concrete UpdateType.
*/
-public interface CommonCUDRequestFactory<UT extends CommonUpdateType> extends Serializable {
+public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
/**
* Gets a create request object instance.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java
index 1e38813..9f67bb7 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java
@@ -18,18 +18,17 @@
*/
package org.apache.olingo.client.api.communication.request.invoke;
+import java.net.URI;
+import java.util.Map;
+
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
-import java.io.Serializable;
-import java.net.URI;
-import java.util.Map;
-
/**
* OData request factory class.
*/
-public interface InvokeRequestFactory extends Serializable {
+public interface InvokeRequestFactory {
/**
* Gets an invoke request instance for the operation bound to given URI.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java
index 721f3e3..29b03e9 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java
@@ -20,13 +20,8 @@ package org.apache.olingo.client.api.communication.request.invoke;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
-import java.io.Serializable;
-
/**
* Marker class for invoke with no return type.
*/
-public class ODataNoContent implements Serializable, ODataInvokeResult {
-
- private static final long serialVersionUID = 2780193571934253136L;
-
+public class ODataNoContent implements ODataInvokeResult {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java
index da8b972..dfb6a22 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java
@@ -18,17 +18,16 @@
*/
package org.apache.olingo.client.api.communication.request.retrieve;
+import java.net.URI;
+
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
-import java.io.Serializable;
-import java.net.URI;
-
/**
* OData request factory class.
*/
-public interface CommonRetrieveRequestFactory extends Serializable {
+public interface CommonRetrieveRequestFactory {
/**
* Gets a metadata request instance.
@@ -104,7 +103,6 @@ public interface CommonRetrieveRequestFactory extends Serializable {
/**
* Gets a uri request returning a single OData entity property value.
*
- * @param <T> concrete ODataProperty implementation.
* @param uri request URI.
* @return new {@link ODataValueRequest} instance.
*/
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/CommonFilterFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/CommonFilterFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/CommonFilterFactory.java
index 7304721..e65200d 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/CommonFilterFactory.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/CommonFilterFactory.java
@@ -18,12 +18,10 @@
*/
package org.apache.olingo.client.api.uri;
-import java.io.Serializable;
-
/**
* OData filter factory.
*/
-public interface CommonFilterFactory extends Serializable {
+public interface CommonFilterFactory {
CommonFilterArgFactory getArgFactory();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
index dc1d000..01f5a95 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java
@@ -67,7 +67,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
streamDashBoundary();
final ODataChangesetResponseItem expectedResItem = new ODataChangesetResponseItem(continueOnError);
- ((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
+ ((AbstractODataBatchRequest<?, ?>) req).addExpectedResItem(expectedResItem);
currentItem = new ODataChangesetImpl(req, expectedResItem);
@@ -90,7 +90,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
final ODataSingleResponseItem expectedResItem = new ODataSingleResponseItem();
currentItem = new ODataSingleRequestImpl(req, expectedResItem);
- ((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
+ ((AbstractODataBatchRequest<?, ?>) req).addExpectedResItem(expectedResItem);
((ODataSingleRequest) currentItem).setRequest(request);
}
@@ -122,7 +122,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
newLine();
// stream batch-boundary
- stream(("--" + ((AbstractODataBatchRequest) req).boundary).getBytes());
+ stream(("--" + ((AbstractODataBatchRequest<?, ?>) req).boundary).getBytes());
newLine();
}
@@ -132,7 +132,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
protected void streamCloseDelimiter() {
// stream close-delimiter
newLine();
- stream(("--" + ((AbstractODataBatchRequest) req).boundary + "--").getBytes());
+ stream(("--" + ((AbstractODataBatchRequest<?, ?>) req).boundary + "--").getBytes());
}
protected abstract void validateSingleRequest(ODataBatchableRequest request);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java
index 631dbed..e0cbac7 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchRequestFactory.java
@@ -20,8 +20,6 @@ import org.apache.olingo.client.api.communication.request.batch.CommonBatchReque
*/
public abstract class AbstractBatchRequestFactory implements CommonBatchRequestFactory {
- private static final long serialVersionUID = -3875283254713404483L;
-
protected final CommonODataClient<?> client;
protected AbstractBatchRequestFactory(final CommonODataClient<?> client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java
index a520185..a246f0f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java
@@ -26,8 +26,6 @@ import org.apache.olingo.client.core.communication.request.batch.AbstractBatchRe
public class BatchRequestFactoryImpl extends AbstractBatchRequestFactory
implements BatchRequestFactory {
- private static final long serialVersionUID = -6271567229804128570L;
-
public BatchRequestFactoryImpl(final ODataClient client) {
super(client);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java
index e406e16..864a512 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java
@@ -18,11 +18,15 @@
*/
package org.apache.olingo.client.core.communication.request.batch.v3;
+import java.io.IOException;
+import java.net.URI;
+import java.util.Iterator;
+import java.util.concurrent.TimeUnit;
+
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
-import org.apache.olingo.client.api.communication.request.ODataStreamedRequest;
import org.apache.olingo.client.api.communication.request.batch.BatchManager;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.request.batch.v3.ODataBatchRequest;
@@ -34,14 +38,9 @@ import org.apache.olingo.client.core.communication.request.batch.AbstractBatchMa
import org.apache.olingo.client.core.communication.request.batch.AbstractODataBatchRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.communication.response.batch.ODataBatchResponseManager;
-import java.io.IOException;
-import java.net.URI;
-import java.util.Iterator;
-import java.util.concurrent.TimeUnit;
-public class ODataBatchRequestImpl
- extends AbstractODataBatchRequest<ODataBatchResponse, BatchManager>
- implements ODataBatchRequest, ODataStreamedRequest<ODataBatchResponse, BatchManager> {
+public class ODataBatchRequestImpl extends AbstractODataBatchRequest<ODataBatchResponse, BatchManager>
+ implements ODataBatchRequest {
public ODataBatchRequestImpl(final ODataClient odataClient, final URI uri) {
super(odataClient, uri);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java
index dc350ee..9d93ad4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java
@@ -26,8 +26,6 @@ import org.apache.olingo.client.core.communication.request.batch.AbstractBatchRe
public class BatchRequestFactoryImpl extends AbstractBatchRequestFactory
implements BatchRequestFactory {
- private static final long serialVersionUID = 788349446729208639L;
-
public BatchRequestFactoryImpl(final ODataClient client) {
super(client);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
index a09c49c..2769a98 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java
@@ -43,8 +43,6 @@ import java.net.URI;
public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> implements CommonCUDRequestFactory<UT> {
- private static final long serialVersionUID = -2723641791198745990L;
-
protected final CommonODataClient<?> client;
protected AbstractCUDRequestFactory(final CommonODataClient<?> client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java
index 3ade529..987b704 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java
@@ -29,10 +29,7 @@ import org.apache.olingo.commons.api.domain.ODataLink;
import java.net.URI;
-public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType>
- implements CUDRequestFactory {
-
- private static final long serialVersionUID = 109196636064983035L;
+public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType> implements CUDRequestFactory {
public CUDRequestFactoryImpl(final ODataClient client) {
super(client);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java
index 57473a1..090ec1e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java
@@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.core.communication.request.cud.v4;
+import java.net.URI;
+
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
@@ -25,12 +27,7 @@ import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.communication.request.cud.AbstractCUDRequestFactory;
import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
-import java.net.URI;
-
-public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType>
- implements CUDRequestFactory {
-
- private static final long serialVersionUID = 3080623853913380425L;
+public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType> implements CUDRequestFactory {
public CUDRequestFactoryImpl(final ODataClient client) {
super(client);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
index 5505222..2fe8a1e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java
@@ -39,8 +39,6 @@ import java.util.Map;
public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInvokeRequestFactory
implements EdmEnabledInvokeRequestFactory {
- private static final long serialVersionUID = -3637346544674184337L;
-
private final CommonEdmEnabledODataClient<?> edmClient;
public AbstractEdmEnabledInvokeRequestFactory(final CommonEdmEnabledODataClient<?> edmClient) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java
index 1a46d04..89648bf 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java
@@ -35,8 +35,6 @@ import java.util.Map;
public abstract class AbstractInvokeRequestFactory implements InvokeRequestFactory {
- private static final long serialVersionUID = -906760270085197249L;
-
@Override
public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getFunctionInvokeRequest(
final URI uri, final Class<RES> resultRef) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java
index 16a629e..e6c2e4c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java
@@ -30,8 +30,6 @@ import java.util.Map;
public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory {
- private static final long serialVersionUID = 5854571629835831697L;
-
private final EdmEnabledODataClient edmClient;
public EdmEnabledInvokeRequestFactoryImpl(final EdmEnabledODataClient client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java
index c369c04..2243a29 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java
@@ -30,8 +30,6 @@ import java.util.Map;
public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {
- private static final long serialVersionUID = -659256862901915496L;
-
private final ODataClient client;
public InvokeRequestFactoryImpl(final ODataClient client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java
index 46027f6..c3806fd 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java
@@ -30,8 +30,6 @@ import java.util.Map;
public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory {
- private static final long serialVersionUID = 5854571629835831697L;
-
private final EdmEnabledODataClient edmClient;
public EdmEnabledInvokeRequestFactoryImpl(final EdmEnabledODataClient client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java
index de4e1dc..0ceb8ad 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java
@@ -30,8 +30,6 @@ import java.util.Map;
public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {
- private static final long serialVersionUID = 8452737360003104372L;
-
private final ODataClient client;
public InvokeRequestFactoryImpl(final ODataClient client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java
index 46b2bb2..aa6ee2b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java
@@ -32,8 +32,6 @@ import java.net.URI;
public abstract class AbstractRetrieveRequestFactory implements CommonRetrieveRequestFactory {
- private static final long serialVersionUID = -111683263158803362L;
-
protected final CommonODataClient<?> client;
protected AbstractRetrieveRequestFactory(final CommonODataClient<?> client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java
index 25020fb..4762332 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java
@@ -37,11 +37,7 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import java.net.URI;
-@SuppressWarnings("unchecked")
-public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory
- implements RetrieveRequestFactory {
-
- private static final long serialVersionUID = 6602745001042802479L;
+public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory implements RetrieveRequestFactory {
public RetrieveRequestFactoryImpl(final ODataClient client) {
super(client);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java
index f3a1735..f74e7a7 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java
@@ -38,12 +38,9 @@ import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
import java.net.URI;
-@SuppressWarnings("unchecked")
public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory
implements RetrieveRequestFactory {
- private static final long serialVersionUID = 546577958047902917L;
-
public RetrieveRequestFactoryImpl(final ODataClient client) {
super(client);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestFactoryImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestFactoryImpl.java
index afd08f0..851ce95 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestFactoryImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestFactoryImpl.java
@@ -28,8 +28,6 @@ import org.apache.olingo.client.api.v4.ODataClient;
public class AsyncRequestFactoryImpl implements AsyncRequestFactory {
- private static final long serialVersionUID = 546577958047902917L;
-
private final ODataClient client;
public AsyncRequestFactoryImpl(final ODataClient client) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java
index 79bb2ab..5b861d7 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java
@@ -18,11 +18,17 @@
*/
package org.apache.olingo.client.core.edm;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.commons.lang3.ArrayUtils;
import org.apache.olingo.client.api.edm.xml.EnumType;
import org.apache.olingo.client.api.edm.xml.Member;
import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.edm.EdmEnumType;
import org.apache.olingo.commons.api.edm.EdmException;
import org.apache.olingo.commons.api.edm.EdmMember;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
@@ -32,14 +38,7 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.core.edm.AbstractEdmEnumType;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-public class EdmEnumTypeImpl extends AbstractEdmEnumType implements EdmEnumType {
+public class EdmEnumTypeImpl extends AbstractEdmEnumType {
private static final EdmPrimitiveTypeKind[] VALID_UNDERLYING_TYPES = new EdmPrimitiveTypeKind[] {
EdmPrimitiveTypeKind.Byte,
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java
index fbdf82b..7faba4f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java
@@ -18,12 +18,14 @@
*/
package org.apache.olingo.client.core.edm;
+import java.util.Collections;
+import java.util.List;
+
import org.apache.olingo.client.api.edm.xml.CommonProperty;
import org.apache.olingo.client.api.edm.xml.v4.Property;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
import org.apache.olingo.commons.api.edm.EdmMapping;
-import org.apache.olingo.commons.api.edm.EdmProperty;
import org.apache.olingo.commons.api.edm.EdmTerm;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.edm.geo.SRID;
@@ -31,10 +33,7 @@ import org.apache.olingo.commons.core.edm.AbstractEdmProperty;
import org.apache.olingo.commons.core.edm.EdmAnnotationHelper;
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
-import java.util.Collections;
-import java.util.List;
-
-public class EdmPropertyImpl extends AbstractEdmProperty implements EdmProperty {
+public class EdmPropertyImpl extends AbstractEdmProperty {
private final FullQualifiedName structuredTypeName;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java
index 851b299..4d7c9f4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java
@@ -68,9 +68,7 @@ public class EdmReturnTypeImpl extends AbstractEdmReturnType {
@Override
public SRID getSrid() {
- return (returnType instanceof ReturnType)
- ? ((ReturnType) returnType).getSrid()
- : null;
+ return returnType == null ? null : returnType.getSrid();
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java
index 8dbcf0f..e314f58 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java
@@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.core.edm;
+import java.util.List;
+
import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
@@ -25,7 +27,6 @@ import org.apache.olingo.commons.api.edm.EdmException;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.EdmTerm;
-import org.apache.olingo.commons.api.edm.EdmTypeDefinition;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.api.edm.geo.SRID;
@@ -33,9 +34,7 @@ import org.apache.olingo.commons.core.edm.AbstractEdmTypeDefinition;
import org.apache.olingo.commons.core.edm.EdmAnnotationHelper;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
-import java.util.List;
-
-public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition implements EdmTypeDefinition {
+public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition {
private final TypeDefinition typeDefinition;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
index f545885..cf55756 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
@@ -30,15 +30,11 @@ import java.util.List;
public class EdmFunctionImportProxy extends EdmOperationImportImpl implements EdmFunctionImport {
- private final FunctionImport functionImport;
-
private FullQualifiedName functionFQN;
public EdmFunctionImportProxy(final Edm edm, final EdmEntityContainer container, final String name,
final FunctionImport functionImport) {
-
super(edm, container, name, functionImport.getEntitySet());
- this.functionImport = functionImport;
}
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java
index e4e3c58..f3f670d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java
@@ -41,8 +41,6 @@ import java.util.List;
public class EdmNavigationPropertyProxy extends AbstractEdmNavigationProperty {
- private final List<? extends Schema> xmlSchemas;
-
private final NavigationProperty navigationProperty;
private final FullQualifiedName typeFQN;
@@ -61,7 +59,6 @@ public class EdmNavigationPropertyProxy extends AbstractEdmNavigationProperty {
final NavigationProperty navigationProperty) {
super(edm, navigationProperty.getName());
- this.xmlSchemas = xmlSchemas;
this.navigationProperty = navigationProperty;
final FullQualifiedName relFQN = new FullQualifiedName(navigationProperty.getRelationship());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java
index 69685d5..8dab7b4 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java
@@ -29,14 +29,11 @@ import java.util.List;
public class EdmRecordImpl extends AbstractEdmAnnotatableDynamicAnnotationExpression implements EdmRecord {
- private final Edm edm;
-
private final List<EdmPropertyValue> propertyValues;
private EdmStructuredType type;
public EdmRecordImpl(final Edm edm, final String type, final List<EdmPropertyValue> propertyValues) {
- this.edm = edm;
this.propertyValues = propertyValues;
if (type != null) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractAnnotations.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractAnnotations.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractAnnotations.java
index 13ddbca..b065901 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractAnnotations.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractAnnotations.java
@@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public abstract class AbstractAnnotations extends AbstractEdmItem
implements org.apache.olingo.client.api.edm.xml.CommonAnnotations {
- private static final long serialVersionUID = 4926640428016042620L;
-
@JsonProperty(value = "Target", required = true)
private String target;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java
index b02d8ca..9c62ddf 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java
@@ -26,8 +26,6 @@ import org.apache.olingo.client.api.edm.xml.ComplexType;
@JsonDeserialize(using = ComplexTypeDeserializer.class)
public abstract class AbstractComplexType extends AbstractEdmItem implements ComplexType {
- private static final long serialVersionUID = -4765071294433482957L;
-
private String name;
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java
index 26f1612..646ca77 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java
@@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.DataServices;
@JsonDeserialize(using = DataServicesDeserializer.class)
public abstract class AbstractDataServices extends AbstractEdmItem implements DataServices {
- private static final long serialVersionUID = -9126377222393876166L;
-
private String dataServiceVersion;
private String maxDataServiceVersion;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java
index a15a165..e71e5fb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java
@@ -25,8 +25,6 @@ import org.apache.olingo.client.api.edm.xml.Edmx;
@JsonDeserialize(using = EdmxDeserializer.class)
public abstract class AbstractEdmx extends AbstractEdmItem implements Edmx {
- private static final long serialVersionUID = -5480835122183091469L;
-
private String version;
private DataServices dataServices;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java
index 980558f..a9d5ec5 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java
@@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = EntityContainerDeserializer.class)
public abstract class AbstractEntityContainer extends AbstractEdmItem implements EntityContainer {
- private static final long serialVersionUID = 4121974387552855032L;
-
private String name;
private String _extends;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java
index a436e2e..f5da65f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java
@@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.EntitySet;
@JsonDeserialize(using = EntitySetDeserializer.class)
public abstract class AbstractEntitySet extends AbstractEdmItem implements EntitySet {
- private static final long serialVersionUID = -6577263439520376420L;
-
private String name;
private String entityType;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java
index d228dd6..c72bbd2 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java
@@ -25,8 +25,6 @@ import org.apache.olingo.client.api.edm.xml.EntityType;
@JsonDeserialize(using = EntityTypeDeserializer.class)
public abstract class AbstractEntityType extends AbstractComplexType implements EntityType {
- private static final long serialVersionUID = -1579462552966168139L;
-
private boolean abstractEntityType = false;
private String baseType;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java
index e307902..2968127 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java
@@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = EnumTypeDeserializer.class)
public abstract class AbstractEnumType extends AbstractEdmItem implements EnumType {
- private static final long serialVersionUID = 2688487586103418210L;
-
private String name;
private String underlyingType;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java
index 9e94439..0f358dd 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java
@@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.Member;
public abstract class AbstractMember extends AbstractEdmItem implements Member {
- private static final long serialVersionUID = -1852481655317148552L;
-
@JsonProperty(value = "Name", required = true)
private String name;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java
index c65dbc7..d2dc614 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java
@@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty;
public class AbstractNavigationProperty extends AbstractEdmItem implements CommonNavigationProperty {
- private static final long serialVersionUID = 3112463683071069594L;
-
@JsonProperty(value = "Name", required = true)
private String name;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java
index 9de4834..60f4d26 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java
@@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.CommonParameter;
@JsonDeserialize(using = ParameterDeserializer.class)
public abstract class AbstractParameter extends AbstractEdmItem implements CommonParameter {
- private static final long serialVersionUID = -4305016554930334342L;
-
private String name;
private String type;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java
index b04e220..a20c492 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java
@@ -25,8 +25,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
@JsonDeserialize(using = PropertyDeserializer.class)
public abstract class AbstractProperty extends AbstractEdmItem implements CommonProperty {
- private static final long serialVersionUID = -6004492361142315153L;
-
private String name;
private String type;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java
index ad3f10a..39bfc3b 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java
@@ -27,8 +27,6 @@ import org.apache.olingo.client.api.edm.xml.Schema;
@JsonDeserialize(using = SchemaDeserializer.class)
public abstract class AbstractSchema extends AbstractEdmItem implements Schema {
- private static final long serialVersionUID = -1356392748971378455L;
-
private String namespace;
private String alias;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java
index f8c5eb0..3490dc5 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java
@@ -32,8 +32,6 @@ import java.util.Map;
*/
public abstract class AbstractXMLMetadata extends AbstractEdmItem implements XMLMetadata {
- private static final long serialVersionUID = -1214173426671503187L;
-
protected final Edmx edmx;
protected final Map<String, Schema> schemaByNsOrAlias;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java
index fb7f2ec..1ee6849 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java
@@ -31,7 +31,6 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import java.io.IOException;
-@SuppressWarnings("rawtypes")
public class EntityContainerDeserializer extends AbstractEdmDeserializer<AbstractEntityContainer> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java
index b198ca8..5b2d708 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java
@@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = EntityKeyDeserializer.class)
public class EntityKeyImpl extends AbstractEdmItem implements EntityKey {
- private static final long serialVersionUID = 2586047015894794685L;
-
private final List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java
index f53823d..c3bd276 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java
@@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.OnDeleteAction;
public class OnDeleteImpl extends AbstractEdmItem implements OnDelete {
- private static final long serialVersionUID = -5321523424474336347L;
-
@JsonProperty(value = "Action", required = true)
private OnDeleteAction action = OnDeleteAction.None;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java
index 21aaa5b..a341c6a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java
@@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.PropertyRef;
public class PropertyRefImpl extends AbstractEdmItem implements PropertyRef {
- private static final long serialVersionUID = 6738212067449628983L;
-
@JsonProperty(value = "Name", required = true)
private String name;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java
index 6b521ec..3d93848 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java
@@ -34,7 +34,6 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import java.io.IOException;
-@SuppressWarnings("rawtypes")
public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> {
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java
index 886e523..ceffb91 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java
@@ -30,8 +30,6 @@ import java.util.List;
@JsonDeserialize(using = AnnotationsDeserializer.class)
public class AnnotationsImpl extends AbstractAnnotations implements Annotations {
- private static final long serialVersionUID = 3877353656301805410L;
-
private final List<TypeAnnotation> typeAnnotations = new ArrayList<TypeAnnotation>();
private final List<ValueAnnotation> valueAnnotations = new ArrayList<ValueAnnotation>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java
index de46ca9..ac47206 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java
@@ -25,8 +25,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class AssociationEndImpl extends AbstractEdmItem implements AssociationEnd {
- private static final long serialVersionUID = 3305394053564979376L;
-
@JsonProperty(value = "Type", required = true)
private String type;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
index fbf94c9..a356e5e 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java
@@ -30,8 +30,6 @@ import java.util.List;
@JsonDeserialize(using = AssociationDeserializer.class)
public class AssociationImpl extends AbstractEdmItem implements Association {
- private static final long serialVersionUID = 73763231919532482L;
-
private String name;
private ReferentialConstraint referentialConstraint;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
index 1106883..f3a232a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java
@@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class AssociationSetEndImpl extends AbstractEdmItem implements AssociationSetEnd {
- private static final long serialVersionUID = -6238344152962217446L;
-
@JsonProperty("Role")
private String role;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
index 2b6d386..7908c52 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java
@@ -29,8 +29,6 @@ import java.util.List;
@JsonDeserialize(using = AssociationSetDeserializer.class)
public class AssociationSetImpl extends AbstractEdmItem implements AssociationSet {
- private static final long serialVersionUID = 1248430921598774799L;
-
private String name;
private String association;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
index 736dd9c..7a9a2a1 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java
@@ -18,15 +18,12 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
-import org.apache.olingo.client.api.edm.xml.ComplexType;
-import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
-
import java.util.ArrayList;
import java.util.List;
-public class ComplexTypeImpl extends AbstractComplexType implements ComplexType {
+import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
- private static final long serialVersionUID = -1251230308269425962L;
+public class ComplexTypeImpl extends AbstractComplexType {
private final List<PropertyImpl> properties = new ArrayList<PropertyImpl>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
index 758400c..27b4cab 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java
@@ -26,8 +26,6 @@ import java.util.List;
public class DataServicesImpl extends AbstractDataServices {
- private static final long serialVersionUID = 633129618050875211L;
-
private final List<Schema> schemas = new ArrayList<Schema>();
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EdmxImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EdmxImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EdmxImpl.java
index 78d3471..017c12f 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EdmxImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EdmxImpl.java
@@ -22,8 +22,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmx;
public class EdmxImpl extends AbstractEdmx {
- private static final long serialVersionUID = -8031883176876401375L;
-
@Override
public DataServicesImpl getDataServices() {
return (DataServicesImpl) super.getDataServices();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
index 1b788ee..f5757cd 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java
@@ -28,8 +28,6 @@ import java.util.List;
public class EntityContainerImpl extends AbstractEntityContainer {
- private static final long serialVersionUID = 8934431875078180370L;
-
private final List<EntitySet> entitySets = new ArrayList<EntitySet>();
private final List<AssociationSet> associationSets = new ArrayList<AssociationSet>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntitySetImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntitySetImpl.java
index 1757c35..4a479c7 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntitySetImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntitySetImpl.java
@@ -21,7 +21,4 @@ package org.apache.olingo.client.core.edm.xml.v3;
import org.apache.olingo.client.core.edm.xml.AbstractEntitySet;
public class EntitySetImpl extends AbstractEntitySet {
-
- private static final long serialVersionUID = 5570833733884884012L;
-
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
index f692161..0e296f9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java
@@ -25,8 +25,6 @@ import java.util.List;
public class EntityTypeImpl extends AbstractEntityType {
- private static final long serialVersionUID = 8727765036150269547L;
-
private final List<PropertyImpl> properties = new ArrayList<PropertyImpl>();
private final List<NavigationPropertyImpl> navigationProperties = new ArrayList<NavigationPropertyImpl>();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
index 69017b7..5fdd7cb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java
@@ -26,8 +26,6 @@ import java.util.List;
public class EnumTypeImpl extends AbstractEnumType {
- private static final long serialVersionUID = 8967396195669128419L;
-
private final List<Member> members = new ArrayList<Member>();
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
index 6526afa..caa574a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java
@@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = FunctionImportDeserializer.class)
public class FunctionImportImpl implements FunctionImport {
- private static final long serialVersionUID = -6214472528425935461L;
-
private String name;
private String returnType;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/MemberImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/MemberImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/MemberImpl.java
index 7ef4d86..5e653cb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/MemberImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/MemberImpl.java
@@ -21,7 +21,4 @@ package org.apache.olingo.client.core.edm.xml.v3;
import org.apache.olingo.client.core.edm.xml.AbstractMember;
public class MemberImpl extends AbstractMember {
-
- private static final long serialVersionUID = 6605381518349837929L;
-
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
index ec35c17..4734064 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java
@@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractNavigationProperty;
public class NavigationPropertyImpl extends AbstractNavigationProperty implements NavigationProperty {
- private static final long serialVersionUID = -2889417442815563307L;
-
@JsonProperty(value = "Relationship", required = true)
private String relationship;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ParameterImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ParameterImpl.java
index f555406..b9a817c 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ParameterImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ParameterImpl.java
@@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractParameter;
public class ParameterImpl extends AbstractParameter implements Parameter {
- private static final long serialVersionUID = 7596724999614891358L;
-
private ParameterMode mode;
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/66097e3d/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java
index 6d8918d..fed3735 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java
@@ -26,8 +26,6 @@ import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
public class PropertyImpl extends AbstractProperty implements Property {
- private static final long serialVersionUID = 6224524803474652100L;
-
private String collation;
private boolean fixedLength;