You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by ol...@apache.org on 2012/02/20 17:53:27 UTC

svn commit: r1291367 - in /incubator/directmemory/trunk/server/directmemory-server-commons/src: main/java/org/apache/directmemory/server/commons/ test/resources/

Author: olamy
Date: Mon Feb 20 16:53:26 2012
New Revision: 1291367

URL: http://svn.apache.org/viewvc?rev=1291367&view=rev
Log:
[DIRECTMEMORY-61] reduce size of json object :-)

Modified:
    incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheConstants.java
    incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriter.java
    incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rq.json
    incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rs.json

Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheConstants.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheConstants.java?rev=1291367&r1=1291366&r2=1291367&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheConstants.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheConstants.java Mon Feb 20 16:53:26 2012
@@ -24,10 +24,6 @@ package org.apache.directmemory.server.c
 public class DirectMemoryCacheConstants
 {
 
-    public static final String ROOT_RQ_NAME = "DirectMemoryRQ";
-
-    public static final String ROOT_RS_NAME = "DirectMemoryRS";
-
     public static final String CACHE_CONTENT_FIELD_NAME = "cacheContent";
 
     public static final String PUT_FIELD_NAME = "put";

Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriter.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriter.java?rev=1291367&r1=1291366&r2=1291367&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriter.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriter.java Mon Feb 20 16:53:26 2012
@@ -68,8 +68,6 @@ public class DirectMemoryCacheWriter
 
             g.writeStartObject();
 
-            g.writeObjectFieldStart( DirectMemoryCacheConstants.ROOT_RQ_NAME );
-
             g.writeStringField( DirectMemoryCacheConstants.KEY_FIELD_NAME, request.getKey() );
 
             g.writeBooleanField( DirectMemoryCacheConstants.PUT_FIELD_NAME, request.isUpdate() );
@@ -93,7 +91,6 @@ public class DirectMemoryCacheWriter
             }
 
             g.writeEndObject();
-            g.writeEndObject();
             g.close();
         }
         catch ( IOException e )
@@ -118,8 +115,6 @@ public class DirectMemoryCacheWriter
 
             g.writeStartObject();
 
-            g.writeObjectFieldStart( DirectMemoryCacheConstants.ROOT_RS_NAME );
-
             g.writeBooleanField( DirectMemoryCacheConstants.FOUND_FIELD_NAME, response.isFound() );
 
             g.writeBooleanField( DirectMemoryCacheConstants.UPDATED_FIELD_NAME, response.isUpdated() );
@@ -131,7 +126,7 @@ public class DirectMemoryCacheWriter
                 g.writeFieldName( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME );
                 g.writeBinary( response.getCacheContent() );
             }
-            g.writeEndObject();
+
             g.writeEndObject();
             g.close();
 

Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rq.json
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rq.json?rev=1291367&r1=1291366&r2=1291367&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rq.json (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rq.json Mon Feb 20 16:53:26 2012
@@ -1,3 +1,3 @@
-{"DirectMemoryRQ":{"key":"101","put":true,"expiresIn":123,
+{"key":"101","put":true,"expiresIn":123,
     "cacheContent":"rO0ABXNyACtvcmcuYXBhY2hlLmRpcmVjdG1lbW9yeS5zZXJ2ZXIuY29tbW9ucy5XaW5l5dYKhxyAjeECAAFMAARuYW1ldAASTGphdmEvbGFuZy9TdHJpbmc7eHB0AAhCb3JkZWF1eA=="
-    ,"serializer":"org.apache.directmemory.serialization.StandardSerializer"}}
\ No newline at end of file
+    ,"serializer":"org.apache.directmemory.serialization.StandardSerializer"}
\ No newline at end of file

Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rs.json
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rs.json?rev=1291367&r1=1291366&r2=1291367&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rs.json (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/test/resources/cache-rs.json Mon Feb 20 16:53:26 2012
@@ -1 +1 @@
-{"DirectMemoryRS":{"found":true,"updated":false,"key":"foo","cacheContent":"Zm9vIGJhcg=="}}
\ No newline at end of file
+{"found":true,"updated":false,"key":"foo","cacheContent":"Zm9vIGJhcg=="}
\ No newline at end of file