svn commit: r1291807 - in /incubator/directmemory/trunk/server: directmemory-server-client/src/main/java/org/apache/directmemory/server/client/ directmemory-server/src/test/java/org/apache/directmemory/server/services/

[olamy]

Author: olamy
Date: Tue Feb 21 14:31:57 2012
New Revision: 1291807

URL: http://svn.apache.org/viewvc?rev=1291807&view=rev
Log:
add ExchangeType configuration in DirectMemoryServerClientConfiguration level 
to simplify request configuration.
BTW it will be still possible to use a request level.

Modified:
    
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java
    
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java

Modified: 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java?rev=1291807&r1=1291806&r2=1291807&view=diff
==============================================================================
--- 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java
 (original)
+++ 
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java
 Tue Feb 21 14:31:57 2012
@@ -49,8 +49,6 @@ public abstract class AbstractDirectMemo
     {
         // TODO handle various exchange model json raw etc..
 
-
-
         if ( request.getSerializer() == null )
         {
             request.setSerializer( this.configuration.getSerializer() );
@@ -78,11 +76,15 @@ public abstract class AbstractDirectMemo
 
     protected String getRequestContentType( DirectMemoryCacheRequest request )
     {
-        return request.getExchangeType().getContentType();
+        return request.getExchangeType() == null
+            ? this.configuration.getExchangeType().getContentType()
+            : request.getExchangeType().getContentType();
     }
 
     protected String getAcceptContentType( DirectMemoryCacheRequest request )
     {
-        return request.getExchangeType().getContentType();
+        return request.getExchangeType() == null
+            ? this.configuration.getExchangeType().getContentType()
+            : request.getExchangeType().getContentType();
     }
 }

Modified: 
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java
URL: 
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java?rev=1291807&r1=1291806&r2=1291807&view=diff
==============================================================================
--- 
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java
 (original)
+++ 
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/ServletWithClientTest.java
 Tue Feb 21 14:31:57 2012
@@ -75,7 +75,9 @@ public class ServletWithClientTest
                 .setHost( "localhost" )
                 .setPort( port )
                 .setHttpPath( "/direct-memory/CacheServlet" )
-                .setSerializer( SerializerFactory.createNewSerializer() );
+                .setSerializer( SerializerFactory.createNewSerializer())
+                .setExchangeType( ExchangeType.JSON );
+
         DirectMemoryHttpClient httpClient = 
HttpClientDirectMemoryHttpClient.instance( configuration );
         configuration.setDirectMemoryHttpClient( httpClient );
 
@@ -100,8 +102,7 @@ public class ServletWithClientTest
         client.put(
             new DirectMemoryCacheRequest<Wine>()
                 .setObject( bordeaux )
-                .setKey( "bordeaux" )
-                .setExchangeType( ExchangeType.JSON ) );
+                .setKey( "bordeaux" ) );
 
         // END SNIPPET: client-put
 
@@ -109,8 +110,8 @@ public class ServletWithClientTest
         DirectMemoryCacheRequest rq =
             new DirectMemoryCacheRequest()
                 .setKey( "bordeaux" )
-                .setExchangeType( ExchangeType.JSON )
                 .setObjectClass( Wine.class );
+
         DirectMemoryCacheResponse<Wine> response = client.retrieve( rq );
 
         assertTrue( response.isFound() );
@@ -127,9 +128,7 @@ public class ServletWithClientTest
 
         DirectMemoryCacheResponse<Wine> response = client.retrieve(
             new DirectMemoryCacheRequest().setKey( "Italian wine better than 
French" )
-                .setExchangeType( ExchangeType.JSON )
-                .setObjectClass(
-                Wine.class ) );
+                .setObjectClass( Wine.class ) );
 
         // due to the key used the server should response BAD Request but it 
says not found
         assertFalse( response.isFound() );
@@ -144,13 +143,11 @@ public class ServletWithClientTest
 
         client.put( new DirectMemoryCacheRequest<Wine>()
                         .setObject( bordeaux )
-                        .setKey( "bordeaux" )
-                        .setExchangeType( ExchangeType.JSON ) );
+                        .setKey( "bordeaux" ) );
 
         DirectMemoryCacheResponse<Wine> response = client.retrieve(
             new DirectMemoryCacheRequest()
                 .setKey( "bordeaux" )
-                .setExchangeType( ExchangeType.JSON )
                 .setObjectClass( Wine.class ) );
 
         assertTrue( response.isFound() );
@@ -167,7 +164,6 @@ public class ServletWithClientTest
 
         response = client.retrieve( new DirectMemoryCacheRequest()
                                         .setKey( "bordeaux" )
-                                        .setExchangeType( ExchangeType.JSON )
                                         .setObjectClass( Wine.class ) );
 
         assertFalse( response.isFound() );