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:50:22 UTC
svn commit: r1291361 - in /incubator/directmemory/trunk/server: ./
directmemory-server-commons/
directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/
Author: olamy
Date: Mon Feb 20 16:50:22 2012
New Revision: 1291361
URL: http://svn.apache.org/viewvc?rev=1291361&view=rev
Log:
[DIRECTMEMORY-61] some cleanup as I started with xml format (was a bad idea)
Removed:
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheStreamRequestHandler.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheStreamResponseHandler.java
Modified:
incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml
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/DirectMemoryCacheParser.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheRequest.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheResponse.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriter.java
incubator/directmemory/trunk/server/pom.xml
Modified: incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml?rev=1291361&r1=1291360&r2=1291361&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/pom.xml Mon Feb 20 16:50:22 2012
@@ -40,10 +40,6 @@
<artifactId>directmemory-cache</artifactId>
</dependency>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </dependency>
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</dependency>
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=1291361&r1=1291360&r2=1291361&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:50:22 2012
@@ -24,21 +24,21 @@ package org.apache.directmemory.server.c
public class DirectMemoryCacheConstants
{
- public static final String XML_REQUEST_ROOT_ELEM_NAME = "DirectMemoryRQ";
+ public static final String ROOT_RQ_NAME = "DirectMemoryRQ";
- public static final String XML_RESPONSE_ROOT_ELEM_NAME = "DirectMemoryRS";
+ public static final String ROOT_RS_NAME = "DirectMemoryRS";
- public static final String CACHE_CONTENT_ELEM_NAME = "cacheContent";
+ public static final String CACHE_CONTENT_FIELD_NAME = "cacheContent";
- public static final String PUT_ATT_NAME = "put";
+ public static final String PUT_FIELD_NAME = "put";
- public static final String KEY_ATT_NAME = "key";
+ public static final String KEY_FIELD_NAME = "key";
- public static final String EXPIRES_IN_ATT_NAME = "expiresIn";
+ public static final String EXPIRES_IN_FIELD_NAME = "expiresIn";
- public static final String UPDATED_ATT_NAME = "updated";
+ public static final String UPDATED_FIELD_NAME = "updated";
- public static final String FOUND_ATT_NAME = "found";
+ public static final String FOUND_FIELD_NAME = "found";
public static final String SERIALIZER_FIELD_NAME = "serializer";
Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheParser.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheParser.java?rev=1291361&r1=1291360&r2=1291361&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheParser.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheParser.java Mon Feb 20 16:50:22 2012
@@ -62,19 +62,19 @@ public class DirectMemoryCacheParser
while ( jp.nextToken() != JsonToken.END_OBJECT )
{
String fieldName = jp.getCurrentName();
- if ( DirectMemoryCacheConstants.KEY_ATT_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.KEY_FIELD_NAME.equals( fieldName ) )
{
rq.setKey( jp.getText() );
}
- if ( DirectMemoryCacheConstants.PUT_ATT_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.PUT_FIELD_NAME.equals( fieldName ) )
{
rq.setUpdate( jp.getValueAsBoolean() );
}
- if ( DirectMemoryCacheConstants.EXPIRES_IN_ATT_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.EXPIRES_IN_FIELD_NAME.equals( fieldName ) )
{
rq.setExpiresIn( jp.getValueAsInt() );
}
- if ( DirectMemoryCacheConstants.CACHE_CONTENT_ELEM_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME.equals( fieldName ) )
{
// binaryValue need to go to nextToken
jp.nextToken();
@@ -115,19 +115,19 @@ public class DirectMemoryCacheParser
while ( jp.nextToken() != JsonToken.END_OBJECT )
{
String fieldName = jp.getCurrentName();
- if ( DirectMemoryCacheConstants.FOUND_ATT_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.FOUND_FIELD_NAME.equals( fieldName ) )
{
rs.setFound( jp.getValueAsBoolean() );
}
- if ( DirectMemoryCacheConstants.UPDATED_ATT_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.UPDATED_FIELD_NAME.equals( fieldName ) )
{
rs.setUpdated( jp.getValueAsBoolean() );
}
- if ( DirectMemoryCacheConstants.KEY_ATT_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.KEY_FIELD_NAME.equals( fieldName ) )
{
rs.setKey( jp.getText() );
}
- if ( DirectMemoryCacheConstants.CACHE_CONTENT_ELEM_NAME.equals( fieldName ) )
+ if ( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME.equals( fieldName ) )
{
// binaryValue need to go to nextToken
jp.nextToken();
Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheRequest.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheRequest.java?rev=1291361&r1=1291360&r2=1291361&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheRequest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheRequest.java Mon Feb 20 16:50:22 2012
@@ -21,16 +21,11 @@ package org.apache.directmemory.server.c
import org.apache.directmemory.serialization.Serializer;
/**
- * xml format request:
- * <pre><![CDATA[
- * <DirectMemoryRQ version="1.0" key="" put="true" expiresIn="">
- * <!-- only use when put is true for updating/add cache content -->
- * <cacheContent>
- * <![CDATA[
- * ]]>
- * </cacheContent>
- * </DirectMemoryRQ>]]>
- * </pre>
+ * json format request:
+ * {"DirectMemoryRQ":{"key":"101","put":true,"expiresIn":123,
+ * "cacheContent":""}}
+ *
+ * cache content is byte[] ie object serialisation
*
* @author Olivier Lamy
*/
Modified: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheResponse.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheResponse.java?rev=1291361&r1=1291360&r2=1291361&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheResponse.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheResponse.java Mon Feb 20 16:50:22 2012
@@ -19,15 +19,10 @@ package org.apache.directmemory.server.c
*/
/**
- * xml format response:
- * <pre><![CDATA[
- * <DirectMemoryRS version="1.0" found="" updated="true" key="">
- * <cacheContent>
- * <![CDATA[
- * ]]>
- * </cacheContent>
- * </DirectMemoryRS>]]>
- * </pre>
+ * json format response:
+ * {"DirectMemoryRS":{"found":true,"updated":false,"key":"foo","cacheContent":""}}
+ *
+ * cache content is byte[] ie object serialisation
*
* @author Olivier Lamy
*/
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=1291361&r1=1291360&r2=1291361&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:50:22 2012
@@ -65,12 +65,12 @@ public class DirectMemoryCacheWriter
XMLStreamWriter xmlStreamWriter = xmlOutputFactory.createXMLStreamWriter( stringWriter );
xmlStreamWriter.writeStartDocument( "1.0" );
- xmlStreamWriter.writeStartElement( DirectMemoryCacheConstants.XML_REQUEST_ROOT_ELEM_NAME );
+ xmlStreamWriter.writeStartElement( DirectMemoryCacheConstants.ROOT_RQ_NAME );
- xmlStreamWriter.writeAttribute( DirectMemoryCacheConstants.KEY_ATT_NAME, request.getKey() );
- xmlStreamWriter.writeAttribute( DirectMemoryCacheConstants.PUT_ATT_NAME,
+ xmlStreamWriter.writeAttribute( DirectMemoryCacheConstants.KEY_FIELD_NAME, request.getKey() );
+ xmlStreamWriter.writeAttribute( DirectMemoryCacheConstants.PUT_FIELD_NAME,
Boolean.toString( request.isUpdate() ) );
- xmlStreamWriter.writeAttribute( DirectMemoryCacheConstants.EXPIRES_IN_ATT_NAME,
+ xmlStreamWriter.writeAttribute( DirectMemoryCacheConstants.EXPIRES_IN_FIELD_NAME,
Integer.toString( request.getExpiresIn() ) );
if ( request.isUpdate() )
@@ -82,7 +82,7 @@ public class DirectMemoryCacheWriter
byte[] bytes = request.getObject() != null
? request.getSerializer().serialize( request.getObject() )
: request.getCacheContent();
- xmlStreamWriter.writeStartElement( DirectMemoryCacheConstants.CACHE_CONTENT_ELEM_NAME );
+ xmlStreamWriter.writeStartElement( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME );
xmlStreamWriter.writeCData( new String( bytes ) );// charset ?
xmlStreamWriter.writeEndElement();
}
@@ -116,13 +116,13 @@ public class DirectMemoryCacheWriter
g.writeStartObject();
- g.writeObjectFieldStart( DirectMemoryCacheConstants.XML_REQUEST_ROOT_ELEM_NAME );
+ g.writeObjectFieldStart( DirectMemoryCacheConstants.ROOT_RQ_NAME );
- g.writeStringField( DirectMemoryCacheConstants.KEY_ATT_NAME, request.getKey() );
+ g.writeStringField( DirectMemoryCacheConstants.KEY_FIELD_NAME, request.getKey() );
- g.writeBooleanField( DirectMemoryCacheConstants.PUT_ATT_NAME, request.isUpdate() );
+ g.writeBooleanField( DirectMemoryCacheConstants.PUT_FIELD_NAME, request.isUpdate() );
- g.writeNumberField( DirectMemoryCacheConstants.EXPIRES_IN_ATT_NAME, request.getExpiresIn() );
+ g.writeNumberField( DirectMemoryCacheConstants.EXPIRES_IN_FIELD_NAME, request.getExpiresIn() );
// FIXME take care of NPE
// cache content generation
@@ -132,7 +132,7 @@ public class DirectMemoryCacheWriter
? request.getSerializer().serialize( request.getObject() )
: request.getCacheContent();
- g.writeFieldName( DirectMemoryCacheConstants.CACHE_CONTENT_ELEM_NAME );
+ g.writeFieldName( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME );
g.writeBinary( bytes );
if ( serializer != null )
@@ -166,17 +166,17 @@ public class DirectMemoryCacheWriter
g.writeStartObject();
- g.writeObjectFieldStart( DirectMemoryCacheConstants.XML_RESPONSE_ROOT_ELEM_NAME );
+ g.writeObjectFieldStart( DirectMemoryCacheConstants.ROOT_RS_NAME );
- g.writeBooleanField( DirectMemoryCacheConstants.FOUND_ATT_NAME, response.isFound() );
+ g.writeBooleanField( DirectMemoryCacheConstants.FOUND_FIELD_NAME, response.isFound() );
- g.writeBooleanField( DirectMemoryCacheConstants.UPDATED_ATT_NAME, response.isUpdated() );
+ g.writeBooleanField( DirectMemoryCacheConstants.UPDATED_FIELD_NAME, response.isUpdated() );
- g.writeStringField( DirectMemoryCacheConstants.KEY_ATT_NAME, response.getKey() );
+ g.writeStringField( DirectMemoryCacheConstants.KEY_FIELD_NAME, response.getKey() );
if ( response.getCacheContent() != null && response.getCacheContent().length > 0 )
{
- g.writeFieldName( DirectMemoryCacheConstants.CACHE_CONTENT_ELEM_NAME );
+ g.writeFieldName( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME );
g.writeBinary( response.getCacheContent() );
}
g.writeEndObject();
Modified: incubator/directmemory/trunk/server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/pom.xml?rev=1291361&r1=1291360&r2=1291361&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/pom.xml (original)
+++ incubator/directmemory/trunk/server/pom.xml Mon Feb 20 16:50:22 2012
@@ -43,14 +43,6 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- <!--
- large CDATA parsing http://jira.codehaus.org/browse/WSTX-211
- -->
- <version>4.0.6</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
<version>1.9.4</version>