olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject [3/5] [OLINGO-317] Merged the format ENUMs
Date Fri, 13 Jun 2014 13:28:25 GMT
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
index 1d99bb3..14866d0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.olingo.client.api.communication.ODataClientErrorException;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
@@ -33,8 +34,6 @@ import org.apache.olingo.commons.api.domain.v4.ODataValuable;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
 import org.junit.Test;
 
 public class PropertyValueTestITCase extends AbstractTestITCase {
@@ -44,7 +43,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PersonID");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setFormat(ODataValueFormat.TEXT);
+    req.setFormat(ODataFormat.TEXT_PLAIN);
     assertEquals("5", req.execute().getBody().toString());
   }
 
@@ -53,7 +52,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("IsRegistered");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setFormat(ODataValueFormat.TEXT);
+    req.setFormat(ODataFormat.TEXT_PLAIN);
     assertEquals("true", req.execute().getBody().toString());
   }
 
@@ -62,7 +61,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("FirstName");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setFormat(ODataValueFormat.TEXT);
+    req.setFormat(ODataFormat.TEXT_PLAIN);
     assertEquals("Peter", req.execute().getBody().toString());
   }
 
@@ -71,7 +70,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("Orders").appendKeySegment(8).appendPropertySegment("OrderDate");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setFormat(ODataValueFormat.TEXT);
+    req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataPrimitiveValue property = req.execute().getBody();
     assertEquals("2011-03-04T16:03:57Z", property.toString());
   }
@@ -81,7 +80,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("Height");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setFormat(ODataValueFormat.TEXT);
+    req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataPrimitiveValue property = req.execute().getBody();
     assertEquals("179", property.toString());
   }
@@ -91,7 +90,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setFormat(ODataValueFormat.TEXT);
+    req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataPrimitiveValue property = req.execute().getBody();
     assertEquals("fi653p3+MklA/LdoBlhWgnMTUUEo8tEgtbMXnF0a3CUNL9BZxXpSRiD9ebTnmNR0zWPjJ"
             + "VIDx4tdmCnq55XrJh+RW9aI/b34wAogK3kcORw=", property.toString());
@@ -102,7 +101,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("PDC");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setAccept(ODataPubFormat.ATOM.toString(ODataServiceVersion.V40));
+    req.setAccept(ODataFormat.ATOM.toString(ODataServiceVersion.V40));
     req.execute().getBody();
   }
 
@@ -133,7 +132,7 @@ public class PropertyValueTestITCase extends AbstractTestITCase {
     final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL).
             appendEntitySetSegment("People").appendKeySegment(5).appendPropertySegment("HomeAddress");
     final ODataValueRequest req = client.getRetrieveRequestFactory().getPropertyValueRequest(uriBuilder.build());
-    req.setFormat(ODataValueFormat.TEXT);
+    req.setFormat(ODataFormat.TEXT_PLAIN);
     final ODataPrimitiveValue property = req.execute().getBody();
     assertTrue(StringUtils.isBlank(property.toString()));
   }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
index 207cbd0..19221e9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
@@ -19,23 +19,24 @@
 package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
 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.v4.URIBuilder;
 import org.apache.olingo.client.api.uri.QueryOption;
+import org.apache.olingo.client.api.uri.v4.URIBuilder;
 import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
 import org.apache.olingo.commons.api.domain.v4.ODataEntity;
 import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
 import org.junit.Test;
 
 /**
@@ -124,12 +125,12 @@ public class QueryOptionsTestITCase extends AbstractTestITCase {
             appendEntitySetSegment("Customers").appendKeySegment(1).format("json");
 
     final ODataEntityRequest<ODataEntity> req = client.getRetrieveRequestFactory().getEntityRequest(uriBuilder.build());
-    req.setFormat(ODataPubFormat.ATOM);
+    req.setFormat(ODataFormat.ATOM);
 
     final ODataRetrieveResponse<ODataEntity> res = req.execute();
     assertNotNull(res);
     assertTrue(res.getContentType().replaceAll(" ", "").
-            startsWith(ODataPubFormat.JSON.toString(client.getServiceVersion())));
+            startsWith(ODataFormat.JSON.toString(client.getServiceVersion())));
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
index bebd927..03621cc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
@@ -19,11 +19,12 @@
 package org.apache.olingo.fit.v4;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.net.URI;
+
 import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
 import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
@@ -31,16 +32,16 @@ import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResp
 import org.apache.olingo.client.api.uri.v4.URIBuilder;
 import org.apache.olingo.client.api.v4.ODataClient;
 import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
-import org.apache.olingo.commons.api.domain.v4.ODataValuable;
 import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
+import org.apache.olingo.commons.api.domain.v4.ODataValuable;
 import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
 import org.apache.olingo.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
 import org.junit.Test;
 
 public class SingletonTestITCase extends AbstractTestITCase {
 
-  private void read(final ODataClient client, final ODataPubFormat format) throws EdmPrimitiveTypeException {
+  private void read(final ODataClient client, final ODataFormat format) throws EdmPrimitiveTypeException {
     final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Company");
     final ODataEntityRequest<ODataSingleton> singleton =
             client.getRetrieveRequestFactory().getSingletonRequest(builder.build());
@@ -57,20 +58,20 @@ public class SingletonTestITCase extends AbstractTestITCase {
 
   @Test
   public void readFromAtom() throws EdmPrimitiveTypeException {
-    read(client, ODataPubFormat.ATOM);
+      read(client, ODataFormat.ATOM);
   }
 
   @Test
   public void readFromJSON() throws EdmPrimitiveTypeException {
-    read(edmClient, ODataPubFormat.JSON);
+    read(edmClient, ODataFormat.JSON);
   }
 
   @Test
   public void readfromJSONFull() throws EdmPrimitiveTypeException {
-    read(client, ODataPubFormat.JSON_FULL_METADATA);
+    read(client, ODataFormat.JSON_FULL_METADATA);
   }
 
-  private void readWithAnnotations(final ODataClient client, final ODataPubFormat format) 
+  private void readWithAnnotations(final ODataClient client, final ODataFormat format) 
           throws EdmPrimitiveTypeException {
     
     final URIBuilder builder = client.newURIBuilder(testStaticServiceRootURL).appendSingletonSegment("Boss");    
@@ -88,20 +89,20 @@ public class SingletonTestITCase extends AbstractTestITCase {
 
   @Test
   public void readWithAnnotationsFromAtom() throws EdmPrimitiveTypeException {
-    readWithAnnotations(client, ODataPubFormat.ATOM);
+    readWithAnnotations(client, ODataFormat.ATOM);
   }
 
   @Test
   public void readWithAnnotationsFromJSON() throws EdmPrimitiveTypeException {
-    readWithAnnotations(edmClient, ODataPubFormat.JSON);
+    readWithAnnotations(edmClient, ODataFormat.JSON);
   }
 
   @Test
   public void readWithAnnotationsFromJSONFull() throws EdmPrimitiveTypeException {
-    readWithAnnotations(client, ODataPubFormat.JSON_FULL_METADATA);
+    readWithAnnotations(client, ODataFormat.JSON_FULL_METADATA);
   }
 
-  private void update(final ODataPubFormat format) throws EdmPrimitiveTypeException {
+  private void update(final ODataFormat format) throws EdmPrimitiveTypeException {
     final ODataSingleton changes = getClient().getObjectFactory().newSingleton(
             new FullQualifiedName("Microsoft.Test.OData.Services.ODataWCFService.Company"));
     changes.getProperties().add(getClient().getObjectFactory().newPrimitiveProperty("Revenue",
@@ -122,12 +123,12 @@ public class SingletonTestITCase extends AbstractTestITCase {
 
   @Test
   public void atomUpdate() throws EdmPrimitiveTypeException {
-    update(ODataPubFormat.ATOM);
+    update(ODataFormat.ATOM);
   }
 
   @Test
   public void jsonUpdate() throws EdmPrimitiveTypeException {
-    update(ODataPubFormat.JSON);
+    update(ODataFormat.JSON);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java
index 2e3a0d8..756d28f 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java
@@ -18,20 +18,16 @@
  */
 package org.apache.olingo.client.api;
 
+import java.util.concurrent.ExecutorService;
+
 import org.apache.olingo.client.api.http.HttpClientFactory;
 import org.apache.olingo.client.api.http.HttpUriRequestFactory;
-
-import java.io.Serializable;
-import java.util.concurrent.ExecutorService;
 import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataMediaFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
 
 /**
  * Configuration wrapper.
  */
-public interface CommonConfiguration extends Serializable {
+public interface CommonConfiguration {
 
   /**
    * Gets the configured default <tt>Accept</tt> header value format for a batch request.
@@ -50,16 +46,16 @@ public interface CommonConfiguration extends Serializable {
    * JSON_FULL_METADATA format will be used as default.
    *
    * @return configured OData format for AtomPub if specified; JSON_FULL_METADATA format otherwise.
-   * @see ODataPubFormat#JSON_FULL_METADATA
+   * @see ODataFormat#JSON_FULL_METADATA
    */
-  ODataPubFormat getDefaultPubFormat();
+  ODataFormat getDefaultPubFormat();
 
   /**
    * Sets the default OData format for AtomPub exchanges.
    *
    * @param format default format.
    */
-  void setDefaultPubFormat(ODataPubFormat format);
+  void setDefaultPubFormat(ODataFormat format);
 
   /**
    * Gets the configured OData format. This value depends on what is returned from <tt>getDefaultPubFormat()</tt>.
@@ -74,38 +70,36 @@ public interface CommonConfiguration extends Serializable {
    * as default.
    *
    * @return configured OData value format if specified; TEXT format otherwise.
-   * @see ODataValueFormat#TEXT
+   * @see ODataFormat#TEXT
    */
-  ODataValueFormat getDefaultValueFormat();
+  ODataFormat getDefaultValueFormat();
 
   /**
    * Sets the default OData value format.
    *
    * @param format default format.
    */
-  void setDefaultValueFormat(ODataValueFormat format);
+  void setDefaultValueFormat(ODataFormat format);
 
   /**
    * Gets the configured OData media format. If this configuration parameter doesn't exist the APPLICATION_OCTET_STREAM
    * format will be used as default.
    *
    * @return configured OData media format if specified; APPLICATION_OCTET_STREAM format otherwise.
-   * @see ODataMediaFormat#WILDCARD
    */
-  ODataMediaFormat getDefaultMediaFormat();
+  ODataFormat getDefaultMediaFormat();
 
   /**
    * Sets the default OData media format.
    *
    * @param format default format.
    */
-  void setDefaultMediaFormat(ODataMediaFormat format);
+  void setDefaultMediaFormat(ODataFormat format);
 
   /**
    * Gets the HttpClient factory to be used for executing requests.
    *
    * @return provided implementation (if configured via <tt>setHttpClientFactory</tt> or default.
-   * @see DefaultHttpClientFactory
    */
   HttpClientFactory getHttpClientFactory();
 
@@ -121,7 +115,6 @@ public interface CommonConfiguration extends Serializable {
    * Gets the HttpUriRequest factory for generating requests to be executed.
    *
    * @return provided implementation (if configured via <tt>setHttpUriRequestFactory</tt> or default.
-   * @see DefaultHttpUriRequestFactory
    */
   HttpUriRequestFactory getHttpUriRequestFactory();
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
index d3c929a..136f07a 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java
@@ -33,7 +33,7 @@ import org.apache.olingo.client.api.uri.CommonFilterFactory;
 import org.apache.olingo.client.api.uri.CommonURIBuilder;
 import org.apache.olingo.commons.api.domain.CommonODataObjectFactory;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
-import org.apache.olingo.commons.api.format.Format;
+import org.apache.olingo.commons.api.format.ODataFormat;
 import org.apache.olingo.commons.api.serialization.ODataSerializer;
 
 /**
@@ -55,9 +55,9 @@ public interface CommonODataClient<UT extends CommonUpdateType> {
 
   CommonFilterFactory getFilterFactory();
 
-  ODataSerializer getSerializer(Format format);
+  ODataSerializer getSerializer(ODataFormat format);
 
-  ClientODataDeserializer getDeserializer(Format format);
+  ClientODataDeserializer getDeserializer(ODataFormat format);
 
   CommonODataReader getReader();
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java
index 1d97bcc..6bcb3b8 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java
@@ -19,37 +19,35 @@
 package org.apache.olingo.client.api.communication.request;
 
 import java.util.concurrent.Future;
+
 import org.apache.olingo.client.api.communication.response.ODataResponse;
-import org.apache.olingo.commons.api.format.Format;
+import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * Basic OData request.
  *
- * @param <V> OData response type corresponding to the request implementation.
- * @param <T> Accepted content-type formats by the request in object.
+ * @param <T> OData response type corresponding to the request implementation.
  */
-public interface ODataBasicRequest<V extends ODataResponse, T extends Format> extends ODataRequest {
+public interface ODataBasicRequest<T extends ODataResponse> extends ODataRequest {
 
   /**
    * Request execute.
    *
    * @return return an OData response.
    */
-  V execute();
+  T execute();
 
   /**
    * Async request execute.
    *
    * @return <code>Future&lt;ODataResponse&gt;</code> about the executed request.
    */
-  Future<V> asyncExecute();
+  Future<T> asyncExecute();
 
   /**
    * Override configured request format.
    *
    * @param format request format.
-   * @see com.msopentech.odatajclient.engine.format.ODataFormat
-   * @see com.msopentech.odatajclient.engine.format.ODataPubFormat
    */
-  void setFormat(T format);
+  void setFormat(ODataFormat format);
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java
index 9ac5e95..883e860 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java
@@ -21,11 +21,10 @@ package org.apache.olingo.client.api.communication.request.cud;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * This class implements an OData delete request.
  */
 public interface ODataDeleteRequest
-        extends ODataBasicRequest<ODataDeleteResponse, ODataPubFormat>, ODataBatchableRequest {
+    extends ODataBasicRequest<ODataDeleteResponse>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java
index ddd5975..d13254a 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java
@@ -22,7 +22,6 @@ import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
 import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * This interface describes an OData create request.
@@ -30,5 +29,5 @@ import org.apache.olingo.commons.api.format.ODataPubFormat;
  * @param <E> concrete ODataEntity implementation
  */
 public interface ODataEntityCreateRequest<E extends CommonODataEntity>
-        extends ODataBasicRequest<ODataEntityCreateResponse<E>, ODataPubFormat>, ODataBatchableRequest {
+    extends ODataBasicRequest<ODataEntityCreateResponse<E>>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java
index 341028e..d2c48a9 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java
@@ -22,7 +22,6 @@ import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
 import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * This class implements an OData update request.
@@ -30,5 +29,5 @@ import org.apache.olingo.commons.api.format.ODataPubFormat;
  * @param <E> concrete ODataEntity implementation
  */
 public interface ODataEntityUpdateRequest<E extends CommonODataEntity>
-        extends ODataBasicRequest<ODataEntityUpdateResponse<E>, ODataPubFormat>, ODataBatchableRequest {
+    extends ODataBasicRequest<ODataEntityUpdateResponse<E>>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java
index 25ece1a..c77a915 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java
@@ -21,11 +21,10 @@ package org.apache.olingo.client.api.communication.request.cud;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse;
-import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements an OData update entity property request.
  */
 public interface ODataPropertyUpdateRequest
-        extends ODataBasicRequest<ODataPropertyUpdateResponse, ODataFormat>, ODataBatchableRequest {
+    extends ODataBasicRequest<ODataPropertyUpdateResponse>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java
index ced8c03..63ee311 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java
@@ -21,11 +21,10 @@ package org.apache.olingo.client.api.communication.request.cud;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
 
 /**
  * This class implements an OData update entity property value request.
  */
 public interface ODataValueUpdateRequest
-        extends ODataBasicRequest<ODataValueUpdateResponse, ODataValueFormat>, ODataBatchableRequest {
+    extends ODataBasicRequest<ODataValueUpdateResponse>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkCreateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkCreateRequest.java
index b35a76f..3d52790 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkCreateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkCreateRequest.java
@@ -21,11 +21,10 @@ package org.apache.olingo.client.api.communication.request.cud.v3;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse;
-import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements an insert link OData request.
  */
 public interface ODataLinkCreateRequest
-        extends ODataBasicRequest<ODataLinkOperationResponse, ODataFormat>, ODataBatchableRequest {
+    extends ODataBasicRequest<ODataLinkOperationResponse>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkUpdateRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkUpdateRequest.java
index 765594e..b140647 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkUpdateRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/ODataLinkUpdateRequest.java
@@ -21,11 +21,10 @@ package org.apache.olingo.client.api.communication.request.cud.v3;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse;
-import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements an update link OData request.
  */
 public interface ODataLinkUpdateRequest
-        extends ODataBasicRequest<ODataLinkOperationResponse, ODataFormat>, ODataBatchableRequest {
+    extends ODataBasicRequest<ODataLinkOperationResponse>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java
index 733008a..696ff23 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java
@@ -19,11 +19,11 @@
 package org.apache.olingo.client.api.communication.request.invoke;
 
 import java.util.Map;
+
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.response.ODataInvokeResponse;
 import org.apache.olingo.commons.api.domain.ODataInvokeResult;
 import org.apache.olingo.commons.api.domain.ODataValue;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * This class implements an OData invoke operation request.
@@ -31,7 +31,7 @@ import org.apache.olingo.commons.api.format.ODataPubFormat;
  * @param <T> the actual invoke result
  */
 public interface ODataInvokeRequest<T extends ODataInvokeResult>
-        extends ODataBasicRequest<ODataInvokeResponse<T>, ODataPubFormat> {
+    extends ODataBasicRequest<ODataInvokeResponse<T>> {
 
   /**
    * Sets operation parameters.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/EdmMetadataRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/EdmMetadataRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/EdmMetadataRequest.java
index d4ea45b..e220eca 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/EdmMetadataRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/EdmMetadataRequest.java
@@ -19,10 +19,9 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements a metadata query request.
  */
-public interface EdmMetadataRequest extends ODataRetrieveRequest<Edm, ODataFormat> {
+public interface EdmMetadataRequest extends ODataRetrieveRequest<Edm> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
index 1e65ae8..239fbed 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
@@ -19,10 +19,9 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 import org.apache.olingo.commons.api.domain.CommonODataEntity;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * Describes an OData retrieve query request returning a single entity.
  */
-public interface ODataEntityRequest<E extends CommonODataEntity> extends ODataRetrieveRequest<E, ODataPubFormat> {
+public interface ODataEntityRequest<E extends CommonODataEntity> extends ODataRetrieveRequest<E> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java
index 724b644..0b442a5 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java
@@ -21,11 +21,10 @@ package org.apache.olingo.client.api.communication.request.retrieve;
 import org.apache.olingo.client.api.domain.ODataEntitySetIterator;
 import org.apache.olingo.commons.api.domain.CommonODataEntity;
 import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * This class implements an OData EntitySet query request.
  */
 public interface ODataEntitySetIteratorRequest<ES extends CommonODataEntitySet, E extends CommonODataEntity>
-        extends ODataRetrieveRequest<ODataEntitySetIterator<ES, E>, ODataPubFormat> {
+        extends ODataRetrieveRequest<ODataEntitySetIterator<ES, E>> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java
index c7e1964..766b6d0 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java
@@ -19,13 +19,11 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * This interface describes an OData EntitySet query request.
  *
  * @param <ES> concrete ODataEntitySet implementation
  */
-public interface ODataEntitySetRequest<ES extends CommonODataEntitySet>
-        extends ODataRetrieveRequest<ES, ODataPubFormat> {
+public interface ODataEntitySetRequest<ES extends CommonODataEntitySet> extends ODataRetrieveRequest<ES> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java
index a4bbf3c..3528681 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java
@@ -19,10 +19,9 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 import java.io.InputStream;
-import org.apache.olingo.commons.api.format.ODataMediaFormat;
 
 /**
  * This class implements an OData media query request.
  */
-public interface ODataMediaRequest extends ODataRetrieveRequest<InputStream, ODataMediaFormat> {
+public interface ODataMediaRequest extends ODataRetrieveRequest<InputStream> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java
index f61783b..69e85bf 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java
@@ -24,5 +24,5 @@ import org.apache.olingo.commons.api.format.ODataFormat;
 /**
  * This class implements an OData entity property query request.
  */
-public interface ODataPropertyRequest<T extends CommonODataProperty> extends ODataRetrieveRequest<T, ODataFormat> {
+public interface ODataPropertyRequest<T extends CommonODataProperty> extends ODataRetrieveRequest<T> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataRetrieveRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataRetrieveRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataRetrieveRequest.java
index 61e505c..3b0404a 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataRetrieveRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataRetrieveRequest.java
@@ -21,11 +21,10 @@ package org.apache.olingo.client.api.communication.request.retrieve;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
 import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
-import org.apache.olingo.commons.api.format.Format;
 
 /**
  * This is an abstract representation of an OData retrieve query request returning one or more result item.
  */
-public interface ODataRetrieveRequest<V, T extends Format>
-        extends ODataBasicRequest<ODataRetrieveResponse<V>, T>, ODataBatchableRequest {
+public interface ODataRetrieveRequest<T>
+    extends ODataBasicRequest<ODataRetrieveResponse<T>>, ODataBatchableRequest {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java
index 580798c..494066a 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java
@@ -19,10 +19,9 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 import org.apache.olingo.commons.api.domain.ODataServiceDocument;
-import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements an OData service document request.
  */
-public interface ODataServiceDocumentRequest extends ODataRetrieveRequest<ODataServiceDocument, ODataFormat> {
+public interface ODataServiceDocumentRequest extends ODataRetrieveRequest<ODataServiceDocument> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java
index e78067a..7121ba2 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java
@@ -19,10 +19,9 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
 
 /**
  * This class implements an OData entity property value query request.
  */
-public interface ODataValueRequest extends ODataRetrieveRequest<ODataPrimitiveValue, ODataValueFormat> {
+public interface ODataValueRequest extends ODataRetrieveRequest<ODataPrimitiveValue> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java
index 619aa04..626d0f9 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java
@@ -19,11 +19,11 @@
 package org.apache.olingo.client.api.communication.request.retrieve;
 
 import java.util.Map;
+
 import org.apache.olingo.client.api.edm.xml.Schema;
-import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements an XML metadata request.
  */
-public interface XMLMetadataRequest extends ODataRetrieveRequest<Map<String, Schema>, ODataFormat> {
+public interface XMLMetadataRequest extends ODataRetrieveRequest<Map<String, Schema>> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java
index 1494aea..90cbb46 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java
@@ -20,10 +20,9 @@ package org.apache.olingo.client.api.communication.request.retrieve.v3;
 
 import org.apache.olingo.client.api.communication.request.retrieve.ODataRetrieveRequest;
 import org.apache.olingo.client.api.domain.v3.ODataLinkCollection;
-import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * This class implements an OData link query request.
  */
-public interface ODataLinkCollectionRequest extends ODataRetrieveRequest<ODataLinkCollection, ODataFormat> {
+public interface ODataLinkCollectionRequest extends ODataRetrieveRequest<ODataLinkCollection> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/ODataDeltaRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/ODataDeltaRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/ODataDeltaRequest.java
index 6f75d62..d10713a 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/ODataDeltaRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/ODataDeltaRequest.java
@@ -20,10 +20,9 @@ package org.apache.olingo.client.api.communication.request.retrieve.v4;
 
 import org.apache.olingo.client.api.communication.request.retrieve.ODataRetrieveRequest;
 import org.apache.olingo.commons.api.domain.v4.ODataDelta;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 
 /**
  * Describes an OData retrieve request returning a delta object.
  */
-public interface ODataDeltaRequest extends ODataRetrieveRequest<ODataDelta, ODataPubFormat> {
+public interface ODataDeltaRequest extends ODataRetrieveRequest<ODataDelta> {
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java
index 1af787e..843bd84 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java
@@ -21,7 +21,7 @@ package org.apache.olingo.client.api.communication.request.streamed;
 import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
 import org.apache.olingo.client.api.communication.request.ODataStreamedRequest;
 import org.apache.olingo.client.api.communication.response.ODataResponse;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * Abstract class representing a request concerning a streamed entity.
@@ -36,15 +36,15 @@ public interface ODataStreamedEntityRequest<V extends ODataResponse, T extends O
    * Returns resource representation format.
    *
    * @return the configured format (or default if not specified).
-   * @see org.apache.olingo.client.api.Configuration#getDefaultPubFormat()
+   * @see org.apache.olingo.client.api.CommonConfiguration#getDefaultPubFormat()
    */
-  ODataPubFormat getFormat();
+  ODataFormat getFormat();
 
   /**
    * Override configured request format.
    *
    * @param format request format.
-   * @see org.apache.olingo.client.api.format.ODataFormat
+   * @see ODataFormat
    */
-  void setFormat(final ODataPubFormat format);
+  void setFormat(final ODataFormat format);
 }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
index 3525518..966214e 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java
@@ -35,7 +35,7 @@ import org.apache.olingo.commons.api.data.Entity;
 import org.apache.olingo.commons.api.data.ResWrap;
 import org.apache.olingo.commons.api.domain.CommonODataEntity;
 import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
 import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,11 +56,11 @@ public class ODataEntitySetIterator<ES extends CommonODataEntitySet, E extends C
    */
   private static final Logger LOG = LoggerFactory.getLogger(ODataEntitySetIterator.class);
 
-  private final CommonODataClient odataClient;
+  private final CommonODataClient<?> odataClient;
 
   private final InputStream stream;
 
-  private final ODataPubFormat format;
+  private final ODataFormat format;
 
   private ResWrap<Entity> cached;
 
@@ -80,14 +80,14 @@ public class ODataEntitySetIterator<ES extends CommonODataEntitySet, E extends C
    * @param format OData format.
    */
   public ODataEntitySetIterator(final CommonODataClient<?> odataClient, final InputStream stream,
-          final ODataPubFormat format) {
+          final ODataFormat format) {
 
     this.odataClient = odataClient;
     this.stream = stream;
     this.format = format;
     this.osEntitySet = new ByteArrayOutputStream();
 
-    if (format == ODataPubFormat.ATOM) {
+    if (format == ODataFormat.ATOM) {
       namespaces = getAllElementAttributes(stream, "feed", osEntitySet);
     } else {
       namespaces = null;
@@ -112,7 +112,7 @@ public class ODataEntitySetIterator<ES extends CommonODataEntitySet, E extends C
   @SuppressWarnings("unchecked")
   public boolean hasNext() {
     if (available && cached == null) {
-      if (format == ODataPubFormat.ATOM) {
+      if (format == ODataFormat.ATOM) {
         cached = nextAtomEntityFromEntitySet(stream, osEntitySet, namespaces);
       } else {
         cached = nextJSONEntityFromEntitySet(stream, osEntitySet);
@@ -213,7 +213,7 @@ public class ODataEntitySetIterator<ES extends CommonODataEntitySet, E extends C
         }
 
         if (c >= 0) {
-          jsonEntity = odataClient.getDeserializer(ODataPubFormat.JSON).toEntity(
+          jsonEntity = odataClient.getDeserializer(ODataFormat.JSON).toEntity(
                   new ByteArrayInputStream(entity.toByteArray()));
         }
       } else {
@@ -242,7 +242,7 @@ public class ODataEntitySetIterator<ES extends CommonODataEntitySet, E extends C
         entity.write(">".getBytes(Constants.UTF8));
 
         if (consume(input, "</entry>", entity, true) >= 0) {
-          atomEntity = odataClient.getDeserializer(ODataPubFormat.ATOM).
+          atomEntity = odataClient.getDeserializer(ODataFormat.ATOM).
                   toEntity(new ByteArrayInputStream(entity.toByteArray()));
         }
       }

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
index e41d0bd..c678d2b 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java
@@ -30,7 +30,6 @@ import org.apache.olingo.commons.api.domain.ODataError;
 import org.apache.olingo.commons.api.domain.ODataServiceDocument;
 import org.apache.olingo.commons.api.edm.Edm;
 import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
 
 /**
@@ -77,7 +76,7 @@ public interface CommonODataReader {
    * @return de-serialized entity set.
    * @throws ODataDeserializerException
    */
-  CommonODataEntitySet readEntitySet(InputStream input, ODataPubFormat format) throws ODataDeserializerException;
+  CommonODataEntitySet readEntitySet(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   /**
    * Parses a stream taking care to de-serializes the first OData entity found.
@@ -87,7 +86,7 @@ public interface CommonODataReader {
    * @return entity de-serialized.
    * @throws ODataDeserializerException
    */
-  CommonODataEntity readEntity(InputStream input, ODataPubFormat format) throws ODataDeserializerException;
+  CommonODataEntity readEntity(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   /**
    * Parses a stream taking care to de-serialize the first OData entity property found.

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
index 07a2fcd..8711487 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java
@@ -25,7 +25,6 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity;
 import org.apache.olingo.commons.api.domain.CommonODataProperty;
 import org.apache.olingo.commons.api.domain.ODataLink;
 import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 import org.apache.olingo.commons.api.serialization.ODataSerializerException;
 
 /**
@@ -45,7 +44,7 @@ public interface ODataWriter {
    * @return stream of serialized objects.
    * @throws ODataSerializerException
    */
-  InputStream writeEntities(Collection<CommonODataEntity> entities, ODataPubFormat format)
+  InputStream writeEntities(Collection<CommonODataEntity> entities, ODataFormat format)
       throws ODataSerializerException;
 
   /**
@@ -56,7 +55,7 @@ public interface ODataWriter {
    * @return stream of serialized object.
    * @throws ODataSerializerException
    */
-  InputStream writeEntity(CommonODataEntity entity, ODataPubFormat format)
+  InputStream writeEntity(CommonODataEntity entity, ODataFormat format)
       throws ODataSerializerException;
 
   /**

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java
index 082bf46..b618e0e 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java
@@ -21,21 +21,20 @@ package org.apache.olingo.client.api.serialization.v3;
 import java.io.InputStream;
 
 import org.apache.olingo.client.api.domain.v3.ODataLinkCollection;
-import org.apache.olingo.commons.api.format.ODataFormat;
 import org.apache.olingo.client.api.serialization.CommonODataReader;
 import org.apache.olingo.commons.api.domain.v3.ODataEntity;
 import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
 import org.apache.olingo.commons.api.domain.v3.ODataProperty;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
 import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
 
 public interface ODataReader extends CommonODataReader {
 
   @Override
-  ODataEntitySet readEntitySet(InputStream input, ODataPubFormat format) throws ODataDeserializerException;
+  ODataEntitySet readEntitySet(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   @Override
-  ODataEntity readEntity(InputStream input, ODataPubFormat format) throws ODataDeserializerException;
+  ODataEntity readEntity(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   @Override
   ODataProperty readProperty(InputStream input, ODataFormat format) throws ODataDeserializerException;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java
index 31d4969..993034c 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java
@@ -25,16 +25,15 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntity;
 import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
 import org.apache.olingo.commons.api.domain.v4.ODataProperty;
 import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
 import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
 
 public interface ODataReader extends CommonODataReader {
 
   @Override
-  ODataEntitySet readEntitySet(InputStream input, ODataPubFormat format) throws ODataDeserializerException;
+  ODataEntitySet readEntitySet(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   @Override
-  ODataEntity readEntity(InputStream input, ODataPubFormat format) throws ODataDeserializerException;
+  ODataEntity readEntity(InputStream input, ODataFormat format) throws ODataDeserializerException;
 
   @Override
   ODataProperty readProperty(InputStream input, ODataFormat format) throws ODataDeserializerException;

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/Configuration.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/Configuration.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/Configuration.java
deleted file mode 100644
index 87dff2f..0000000
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/Configuration.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.client.api.v3;
-
-import org.apache.olingo.client.api.CommonConfiguration;
-
-public interface Configuration extends CommonConfiguration {
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/ODataClient.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/ODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/ODataClient.java
index 6360f0a..71d5ffd 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/ODataClient.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/v3/ODataClient.java
@@ -18,6 +18,7 @@
  */
 package org.apache.olingo.client.api.v3;
 
+import org.apache.olingo.client.api.CommonConfiguration;
 import org.apache.olingo.client.api.CommonODataClient;
 import org.apache.olingo.client.api.communication.request.batch.v3.BatchRequestFactory;
 import org.apache.olingo.client.api.communication.request.cud.v3.CUDRequestFactory;
@@ -26,18 +27,18 @@ import org.apache.olingo.client.api.communication.request.retrieve.v3.RetrieveRe
 import org.apache.olingo.client.api.serialization.v3.ODataBinder;
 import org.apache.olingo.client.api.serialization.v3.ODataDeserializer;
 import org.apache.olingo.client.api.serialization.v3.ODataReader;
-import org.apache.olingo.client.api.uri.v3.URIBuilder;
 import org.apache.olingo.client.api.uri.v3.FilterFactory;
+import org.apache.olingo.client.api.uri.v3.URIBuilder;
 import org.apache.olingo.commons.api.domain.v3.ODataObjectFactory;
-import org.apache.olingo.commons.api.format.Format;
+import org.apache.olingo.commons.api.format.ODataFormat;
 
 public interface ODataClient extends CommonODataClient<UpdateType> {
 
   @Override
-  Configuration getConfiguration();
+  CommonConfiguration getConfiguration();
 
   @Override
-  ODataDeserializer getDeserializer(Format format);
+  ODataDeserializer getDeserializer(ODataFormat format);
 
   @Override
   ODataReader getReader();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-api/src/main/java/org/apache/olingo/client/api/v4/ODataClient.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/v4/ODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/v4/ODataClient.java
index fa923aa..ee1fe97 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/v4/ODataClient.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/v4/ODataClient.java
@@ -18,6 +18,7 @@
  */
 package org.apache.olingo.client.api.v4;
 
+import org.apache.olingo.client.api.CommonConfiguration;
 import org.apache.olingo.client.api.CommonODataClient;
 import org.apache.olingo.client.api.communication.request.batch.v4.BatchRequestFactory;
 import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFactory;
@@ -27,19 +28,19 @@ import org.apache.olingo.client.api.communication.request.v4.AsyncRequestFactory
 import org.apache.olingo.client.api.serialization.v4.ODataBinder;
 import org.apache.olingo.client.api.serialization.v4.ODataDeserializer;
 import org.apache.olingo.client.api.serialization.v4.ODataReader;
-import org.apache.olingo.client.api.uri.v4.URIBuilder;
 import org.apache.olingo.client.api.uri.v4.FilterFactory;
 import org.apache.olingo.client.api.uri.v4.SearchFactory;
+import org.apache.olingo.client.api.uri.v4.URIBuilder;
 import org.apache.olingo.commons.api.domain.v4.ODataObjectFactory;
-import org.apache.olingo.commons.api.format.Format;
+import org.apache.olingo.commons.api.format.ODataFormat;
 
 public interface ODataClient extends CommonODataClient<UpdateType> {
 
   @Override
-  Configuration getConfiguration();
+  CommonConfiguration getConfiguration();
 
   @Override
-  ODataDeserializer getDeserializer(Format format);
+  ODataDeserializer getDeserializer(ODataFormat format);
 
   @Override
   ODataReader getReader();

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java
deleted file mode 100644
index dc9ee6c..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.client.core;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.apache.olingo.client.api.CommonConfiguration;
-import org.apache.olingo.commons.api.format.ODataFormat;
-import org.apache.olingo.commons.api.format.ODataMediaFormat;
-import org.apache.olingo.commons.api.format.ODataPubFormat;
-import org.apache.olingo.commons.api.format.ODataValueFormat;
-import org.apache.olingo.client.api.http.HttpClientFactory;
-import org.apache.olingo.client.api.http.HttpUriRequestFactory;
-import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
-import org.apache.olingo.client.core.http.DefaultHttpUriRequestFactory;
-import org.apache.olingo.commons.api.format.ContentType;
-
-public abstract class AbstractConfiguration implements CommonConfiguration {
-
-  private static final String DEFAULT_PUB_FORMAT = "pubFormat";
-
-  private static final String DEFAULT_VALUE_FORMAT = "valueFormat";
-  
-  private static final String DEFAULT_BATCH_ACCEPT_FORMAT = "batchAcceptFormat";
-
-  private static final String DEFAULT_MEDIA_FORMAT = "valueFormat";
-
-  private static final String HTTP_CLIENT_FACTORY = "httpClientFactory";
-
-  private static final String HTTP_URI_REQUEST_FACTORY = "httpUriRequestFactory";
-
-  private static final String USE_XHTTP_METHOD = "useHTTPMethod";
-
-  private static final String KEY_AS_SEGMENT = "keyAsSegment";
-
-  private static final String GZIP_COMPRESSION = "gzipCompression";
-
-  private static final String CHUNKING = "chunking";
-
-  private static final long serialVersionUID = 1L;
-
-  private final Map<String, Object> CONF = new HashMap<String, Object>();
-
-  private transient ExecutorService executor = Executors.newFixedThreadPool(10);
-
-  /**
-   * Gets given configuration property.
-   *
-   * @param key key value of the property to be retrieved.
-   * @param defaultValue default value to be used in case of the given key doesn't exist.
-   * @return property value if exists; default value if does not exist.
-   */
-  protected Object getProperty(final String key, final Object defaultValue) {
-    return CONF.containsKey(key) ? CONF.get(key) : defaultValue;
-  }
-
-  /**
-   * Sets new configuration property.
-   *
-   * @param key configuration property key.
-   * @param value configuration property value.
-   * @return given value.
-   */
-  protected Object setProperty(final String key, final Object value) {
-    return CONF.put(key, value);
-  }
-
-  @Override
-  public String getDefaultBatchAcceptFormat() {
-    return getProperty(DEFAULT_BATCH_ACCEPT_FORMAT, ContentType.MULTIPART_MIXED).toString();
-  }
-  
-  @Override
-  public void setDefaultBatchAcceptFormat(final String contentType) {
-    setProperty(DEFAULT_BATCH_ACCEPT_FORMAT, contentType);
-  }
-  
-  @Override
-  public ODataPubFormat getDefaultPubFormat() {
-    return ODataPubFormat.valueOf(
-            getProperty(DEFAULT_PUB_FORMAT, ODataPubFormat.JSON_FULL_METADATA.name()).toString());
-  }
-
-  @Override
-  public void setDefaultPubFormat(final ODataPubFormat format) {
-    setProperty(DEFAULT_PUB_FORMAT, format.name());
-  }
-
-  @Override
-  public ODataFormat getDefaultFormat() {
-    ODataFormat format;
-
-    switch (getDefaultPubFormat()) {
-      case ATOM:
-        format = ODataFormat.XML;
-        break;
-
-      case JSON_FULL_METADATA:
-        format = ODataFormat.JSON_FULL_METADATA;
-        break;
-
-      case JSON_NO_METADATA:
-        format = ODataFormat.JSON_NO_METADATA;
-        break;
-
-      case JSON:
-      default:
-        format = ODataFormat.JSON;
-    }
-
-    return format;
-  }
-
-  @Override
-  public ODataValueFormat getDefaultValueFormat() {
-    return ODataValueFormat.valueOf(
-            getProperty(DEFAULT_VALUE_FORMAT, ODataValueFormat.TEXT.name()).toString());
-  }
-
-  @Override
-  public void setDefaultValueFormat(final ODataValueFormat format) {
-    setProperty(DEFAULT_VALUE_FORMAT, format.name());
-  }
-
-  @Override
-  public ODataMediaFormat getDefaultMediaFormat() {
-    return ODataMediaFormat.valueOf(
-            getProperty(DEFAULT_VALUE_FORMAT, ODataMediaFormat.APPLICATION_OCTET_STREAM.name()).toString());
-  }
-
-  @Override
-  public void setDefaultMediaFormat(final ODataMediaFormat format) {
-    setProperty(DEFAULT_MEDIA_FORMAT, format.name());
-  }
-
-  @Override
-  public HttpClientFactory getHttpClientFactory() {
-    return (HttpClientFactory) getProperty(HTTP_CLIENT_FACTORY, new DefaultHttpClientFactory());
-  }
-
-  @Override
-  public void setHttpClientFactory(final HttpClientFactory factory) {
-    setProperty(HTTP_CLIENT_FACTORY, factory);
-  }
-
-  @Override
-  public HttpUriRequestFactory getHttpUriRequestFactory() {
-    return (HttpUriRequestFactory) getProperty(HTTP_URI_REQUEST_FACTORY, new DefaultHttpUriRequestFactory());
-  }
-
-  @Override
-  public void setHttpUriRequestFactory(final HttpUriRequestFactory factory) {
-    setProperty(HTTP_URI_REQUEST_FACTORY, factory);
-  }
-
-  @Override
-  public boolean isUseXHTTPMethod() {
-    return (Boolean) getProperty(USE_XHTTP_METHOD, false);
-  }
-
-  @Override
-  public void setUseXHTTPMethod(final boolean value) {
-    setProperty(USE_XHTTP_METHOD, value);
-  }
-
-  @Override
-  public boolean isGzipCompression() {
-    return (Boolean) getProperty(GZIP_COMPRESSION, false);
-  }
-
-  @Override
-  public void setGzipCompression(final boolean value) {
-    setProperty(GZIP_COMPRESSION, value);
-  }
-
-  @Override
-  public boolean isUseChuncked() {
-    return (Boolean) getProperty(CHUNKING, true);
-  }
-
-  @Override
-  public void setUseChuncked(final boolean value) {
-    setProperty(CHUNKING, value);
-  }
-
-  @Override
-  public boolean isKeyAsSegment() {
-    return (Boolean) getProperty(KEY_AS_SEGMENT, false);
-  }
-
-  @Override
-  public void setKeyAsSegment(final boolean value) {
-    setProperty(KEY_AS_SEGMENT, value);
-  }
-
-  @Override
-  public ExecutorService getExecutor() {
-    return executor;
-  }
-
-  @Override
-  public void setExecutor(final ExecutorService executorService) {
-    executor = executorService;
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java
index 71c60c4..2f6e860 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java
@@ -26,8 +26,6 @@ import org.apache.olingo.client.core.serialization.ODataWriterImpl;
 
 public abstract class AbstractODataClient<UT extends CommonUpdateType> implements CommonODataClient<UT> {
 
-  private static final long serialVersionUID = 7269096702397630265L;
-
   private final ODataWriter writer = new ODataWriterImpl(this);
 
   @Override

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-core/src/main/java/org/apache/olingo/client/core/Configuration.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/Configuration.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/Configuration.java
new file mode 100644
index 0000000..1bad32f
--- /dev/null
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/Configuration.java
@@ -0,0 +1,197 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.client.core;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import org.apache.olingo.client.api.CommonConfiguration;
+import org.apache.olingo.client.api.http.HttpClientFactory;
+import org.apache.olingo.client.api.http.HttpUriRequestFactory;
+import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
+import org.apache.olingo.client.core.http.DefaultHttpUriRequestFactory;
+import org.apache.olingo.commons.api.format.ContentType;
+import org.apache.olingo.commons.api.format.ODataFormat;
+
+public class Configuration implements CommonConfiguration {
+
+  private static final String DEFAULT_PUB_FORMAT = "pubFormat";
+
+  private static final String DEFAULT_VALUE_FORMAT = "valueFormat";
+
+  private static final String DEFAULT_BATCH_ACCEPT_FORMAT = "batchAcceptFormat";
+
+  private static final String DEFAULT_MEDIA_FORMAT = "valueFormat";
+
+  private static final String HTTP_CLIENT_FACTORY = "httpClientFactory";
+
+  private static final String HTTP_URI_REQUEST_FACTORY = "httpUriRequestFactory";
+
+  private static final String USE_XHTTP_METHOD = "useHTTPMethod";
+
+  private static final String KEY_AS_SEGMENT = "keyAsSegment";
+
+  private static final String GZIP_COMPRESSION = "gzipCompression";
+
+  private static final String CHUNKING = "chunking";
+
+  private final Map<String, Object> CONF = new HashMap<String, Object>();
+
+  private transient ExecutorService executor = Executors.newFixedThreadPool(10);
+
+  /**
+   * Gets given configuration property.
+   *
+   * @param key key value of the property to be retrieved.
+   * @param defaultValue default value to be used in case of the given key doesn't exist.
+   * @return property value if exists; default value if does not exist.
+   */
+  protected Object getProperty(final String key, final Object defaultValue) {
+    return CONF.containsKey(key) ? CONF.get(key) : defaultValue;
+  }
+
+  /**
+   * Sets new configuration property.
+   *
+   * @param key configuration property key.
+   * @param value configuration property value.
+   * @return given value.
+   */
+  protected Object setProperty(final String key, final Object value) {
+    return CONF.put(key, value);
+  }
+
+  @Override
+  public String getDefaultBatchAcceptFormat() {
+    return getProperty(DEFAULT_BATCH_ACCEPT_FORMAT, ContentType.MULTIPART_MIXED).toString();
+  }
+
+  @Override
+  public void setDefaultBatchAcceptFormat(final String contentType) {
+    setProperty(DEFAULT_BATCH_ACCEPT_FORMAT, contentType);
+  }
+
+  @Override
+  public ODataFormat getDefaultPubFormat() {
+    return (ODataFormat) getProperty(DEFAULT_PUB_FORMAT, ODataFormat.JSON_FULL_METADATA);
+  }
+
+  @Override
+  public void setDefaultPubFormat(final ODataFormat format) {
+    setProperty(DEFAULT_PUB_FORMAT, format);
+  }
+
+  @Override
+  public ODataFormat getDefaultFormat() {
+    ODataFormat format = getDefaultPubFormat();
+    return format == ODataFormat.ATOM ? ODataFormat.XML : format;
+  }
+
+  @Override
+  public ODataFormat getDefaultValueFormat() {
+    return (ODataFormat) getProperty(DEFAULT_VALUE_FORMAT, ODataFormat.TEXT_PLAIN);
+  }
+
+  @Override
+  public void setDefaultValueFormat(final ODataFormat format) {
+    setProperty(DEFAULT_VALUE_FORMAT, format);
+  }
+
+  @Override
+  public ODataFormat getDefaultMediaFormat() {
+    return (ODataFormat) getProperty(DEFAULT_VALUE_FORMAT, ODataFormat.APPLICATION_OCTET_STREAM);
+  }
+
+  @Override
+  public void setDefaultMediaFormat(final ODataFormat format) {
+    setProperty(DEFAULT_MEDIA_FORMAT, format);
+  }
+
+  @Override
+  public HttpClientFactory getHttpClientFactory() {
+    return (HttpClientFactory) getProperty(HTTP_CLIENT_FACTORY, new DefaultHttpClientFactory());
+  }
+
+  @Override
+  public void setHttpClientFactory(final HttpClientFactory factory) {
+    setProperty(HTTP_CLIENT_FACTORY, factory);
+  }
+
+  @Override
+  public HttpUriRequestFactory getHttpUriRequestFactory() {
+    return (HttpUriRequestFactory) getProperty(HTTP_URI_REQUEST_FACTORY, new DefaultHttpUriRequestFactory());
+  }
+
+  @Override
+  public void setHttpUriRequestFactory(final HttpUriRequestFactory factory) {
+    setProperty(HTTP_URI_REQUEST_FACTORY, factory);
+  }
+
+  @Override
+  public boolean isUseXHTTPMethod() {
+    return (Boolean) getProperty(USE_XHTTP_METHOD, false);
+  }
+
+  @Override
+  public void setUseXHTTPMethod(final boolean value) {
+    setProperty(USE_XHTTP_METHOD, value);
+  }
+
+  @Override
+  public boolean isGzipCompression() {
+    return (Boolean) getProperty(GZIP_COMPRESSION, false);
+  }
+
+  @Override
+  public void setGzipCompression(final boolean value) {
+    setProperty(GZIP_COMPRESSION, value);
+  }
+
+  @Override
+  public boolean isUseChuncked() {
+    return (Boolean) getProperty(CHUNKING, true);
+  }
+
+  @Override
+  public void setUseChuncked(final boolean value) {
+    setProperty(CHUNKING, value);
+  }
+
+  @Override
+  public boolean isKeyAsSegment() {
+    return (Boolean) getProperty(KEY_AS_SEGMENT, false);
+  }
+
+  @Override
+  public void setKeyAsSegment(final boolean value) {
+    setProperty(KEY_AS_SEGMENT, value);
+  }
+
+  @Override
+  public ExecutorService getExecutor() {
+    return executor;
+  }
+
+  @Override
+  public void setExecutor(final ExecutorService executorService) {
+    executor = executorService;
+  }
+}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
index a9c87ed..fd462ff 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/ODataClientFactory.java
@@ -18,7 +18,8 @@
  */
 package org.apache.olingo.client.core;
 
-import org.apache.olingo.commons.api.format.ODataPubFormat;
+import org.apache.olingo.commons.api.format.ODataFormat;
+
 
 public final class ODataClientFactory {
 
@@ -29,7 +30,7 @@ public final class ODataClientFactory {
   public static org.apache.olingo.client.api.v3.EdmEnabledODataClient getEdmEnabledV3(final String serviceRoot) {
     final org.apache.olingo.client.api.v3.EdmEnabledODataClient instance =
             new org.apache.olingo.client.core.v3.EdmEnabledODataClientImpl(serviceRoot);
-    instance.getConfiguration().setDefaultPubFormat(ODataPubFormat.JSON);
+    instance.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
     return instance;
   }
 
@@ -40,7 +41,7 @@ public final class ODataClientFactory {
   public static org.apache.olingo.client.api.v4.EdmEnabledODataClient getEdmEnabledV4(final String serviceRoot) {
     final org.apache.olingo.client.api.v4.EdmEnabledODataClient instance =
             new org.apache.olingo.client.core.v4.EdmEnabledODataClientImpl(serviceRoot);
-    instance.getConfiguration().setDefaultPubFormat(ODataPubFormat.JSON);
+    instance.getConfiguration().setDefaultPubFormat(ODataFormat.JSON);
     return instance;
   }
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/37abba5f/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
index c08b426..cfb1112 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java
@@ -23,60 +23,51 @@ import java.io.InputStream;
 import java.net.URI;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.olingo.client.api.ODataBatchConstants;
 import org.apache.olingo.client.api.CommonODataClient;
+import org.apache.olingo.client.api.ODataBatchConstants;
 import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
 import org.apache.olingo.client.api.communication.request.ODataStreamer;
 import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
 import org.apache.olingo.client.api.communication.response.ODataResponse;
-import org.apache.olingo.commons.api.format.Format;
 import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.commons.api.format.ODataFormat;
 
 /**
  * Basic request abstract implementation.
  *
- * @param <V> OData response type corresponding to the request implementation.
- * @param <T> OData format being used.
+ * @param <T> OData response type corresponding to the request implementation.
  */
-public abstract class AbstractODataBasicRequest<V extends ODataResponse, T extends Format>
-        extends AbstractODataRequest<T>
-        implements ODataBasicRequest<V, T> {
+public abstract class AbstractODataBasicRequest<T extends ODataResponse>
+    extends AbstractODataRequest implements ODataBasicRequest<T> {
 
   /**
    * Constructor.
    *
    * @param odataClient client instance getting this request
-   * @param formatRef reference class for the format being used
    * @param method request method.
    * @param uri OData request URI.
    */
-  public AbstractODataBasicRequest(final CommonODataClient<?> odataClient,
-          final Class<T> formatRef, final HttpMethod method, final URI uri) {
-
-    super(odataClient, formatRef, method, uri);
+  public AbstractODataBasicRequest(final CommonODataClient<?> odataClient, final HttpMethod method, final URI uri) {
+    super(odataClient, method, uri);
   }
 
-  /**
-   * {@inheritDoc}
-   */
   @Override
-  public void setFormat(final T format) {
+  public void setFormat(final ODataFormat format) {
     if (format != null) {
-      setAccept(format.toString(odataClient.getServiceVersion()));
-      setContentType(format.toString(odataClient.getServiceVersion()));
+      final String formatString = format.toString(odataClient.getServiceVersion());
+      setAccept(formatString);
+      setContentType(formatString);
     }
   }
 
-  /**
-   * {@inheritDoc}
-   */
   @Override
-  public final Future<V> asyncExecute() {
-    return odataClient.getConfiguration().getExecutor().submit(new Callable<V>() {
+  public final Future<T> asyncExecute() {
+    return odataClient.getConfiguration().getExecutor().submit(new Callable<T>() {
       @Override
-      public V call() throws Exception {
+      public T call() throws Exception {
         return execute();
       }
     });


Mime
View raw message