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/23 00:24:15 UTC
svn commit: r1292582 [1/2] - in /incubator/directmemory/trunk/server:
directmemory-server-client/src/main/java/org/apache/directmemory/server/client/
directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/
directmemory-server-...
Author: olamy
Date: Wed Feb 22 23:24:14 2012
New Revision: 1292582
URL: http://svn.apache.org/viewvc?rev=1292582&view=rev
Log:
remove Cache from classes name we know DirectMemory is a cache
Added:
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryExchange.java (contents, props changed)
- copied, changed from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryCacheExchange.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java (contents, props changed)
- copied, changed from r1292581, 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/DirectMemoryException.java (contents, props changed)
- copied, changed from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheException.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java (contents, props changed)
- copied, changed from r1292581, 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/DirectMemoryRequest.java (contents, props changed)
- copied, changed from r1292581, 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/DirectMemoryResponse.java (contents, props changed)
- copied, changed from r1292581, 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/DirectMemoryWriter.java (contents, props changed)
- copied, changed from r1292581, 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/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java (contents, props changed)
- copied, changed from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheParserTest.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java (contents, props changed)
- copied, changed from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java
Removed:
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryCacheExchange.java
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/DirectMemoryCacheException.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/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheParserTest.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java
Modified:
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/AbstractDirectMemoryHttpClient.java
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java
incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/CacheServletTest.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=1292582&r1=1292581&r2=1292582&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 Wed Feb 22 23:24:14 2012
@@ -19,11 +19,11 @@ package org.apache.directmemory.server.c
*/
import org.apache.commons.io.IOUtils;
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheParser;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
-import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
-import org.apache.directmemory.server.commons.DirectMemoryCacheWriter;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryParser;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
+import org.apache.directmemory.server.commons.DirectMemoryResponse;
+import org.apache.directmemory.server.commons.DirectMemoryWriter;
import org.apache.directmemory.server.commons.ExchangeType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,9 +41,9 @@ public abstract class AbstractDirectMemo
protected Logger log = LoggerFactory.getLogger( getClass() );
- private DirectMemoryCacheWriter writer = DirectMemoryCacheWriter.instance();
+ private DirectMemoryWriter writer = DirectMemoryWriter.instance();
- private DirectMemoryCacheParser parser = DirectMemoryCacheParser.instance();
+ private DirectMemoryParser parser = DirectMemoryParser.instance();
protected DirectMemoryClientConfiguration configuration;
@@ -52,8 +52,8 @@ public abstract class AbstractDirectMemo
this.configuration = configuration;
}
- protected byte[] getPutContent( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ protected byte[] getPutContent( DirectMemoryRequest request )
+ throws DirectMemoryException
{
switch ( request.getExchangeType() )
@@ -67,19 +67,19 @@ public abstract class AbstractDirectMemo
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
case TEXT_PLAIN:
log.error( "{} not implemented yet", ExchangeType.TEXT_PLAIN.getContentType() );
throw new NotImplementedException();
default:
log.error( "exchange type unknown {}", request.getExchangeType() );
- throw new DirectMemoryCacheException( "exchange type unknown " + request.getExchangeType() );
+ throw new DirectMemoryException( "exchange type unknown " + request.getExchangeType() );
}
}
- protected DirectMemoryCacheResponse buildResponse( InputStream inputStream, DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ protected DirectMemoryResponse buildResponse( InputStream inputStream, DirectMemoryRequest request )
+ throws DirectMemoryException
{
switch ( request.getExchangeType() )
@@ -89,7 +89,7 @@ public abstract class AbstractDirectMemo
case JAVA_SERIALIZED_OBJECT:
try
{
- DirectMemoryCacheResponse response = new DirectMemoryCacheResponse();
+ DirectMemoryResponse response = new DirectMemoryResponse();
response.setResponse( request.getSerializer().deserialize( IOUtils.toByteArray( inputStream ),
request.getObjectClass() ) );
return response;
@@ -97,32 +97,32 @@ public abstract class AbstractDirectMemo
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
catch ( ClassNotFoundException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
catch ( IllegalAccessException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
catch ( InstantiationException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
case TEXT_PLAIN:
log.error( "{} not implemented yet", ExchangeType.TEXT_PLAIN.getContentType() );
throw new NotImplementedException();
default:
log.error( "exchange type unknown {}", request.getExchangeType() );
- throw new DirectMemoryCacheException( "exchange type unknown " + request.getExchangeType() );
+ throw new DirectMemoryException( "exchange type unknown " + request.getExchangeType() );
}
}
- protected String buildRequestWithKey( DirectMemoryCacheRequest request )
+ protected String buildRequestWithKey( DirectMemoryRequest request )
{
StringBuilder uri = new StringBuilder( this.configuration.getProtocol() );
uri.append( "://" ).append( this.configuration.getHost() );
@@ -134,14 +134,14 @@ public abstract class AbstractDirectMemo
return uri.toString().replace( ' ', '+' );
}
- protected String getRequestContentType( DirectMemoryCacheRequest request )
+ protected String getRequestContentType( DirectMemoryRequest request )
{
return request.getExchangeType() == null
? this.configuration.getExchangeType().getContentType()
: request.getExchangeType().getContentType();
}
- protected String getAcceptContentType( DirectMemoryCacheRequest request )
+ protected String getAcceptContentType( DirectMemoryRequest request )
{
return request.getExchangeType() == null
? this.configuration.getExchangeType().getContentType()
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DefaultDirectMemoryClient.java Wed Feb 22 23:24:14 2012
@@ -19,9 +19,9 @@ package org.apache.directmemory.server.c
*/
import org.apache.directmemory.serialization.Serializer;
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
-import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
+import org.apache.directmemory.server.commons.DirectMemoryResponse;
import java.io.IOException;
import java.util.concurrent.Future;
@@ -34,7 +34,7 @@ public class DefaultDirectMemoryClient
{
public static DirectMemoryClient instance( DirectMemoryClientConfiguration configuration )
- throws DirectMemoryCacheException
+ throws DirectMemoryException
{
return new DefaultDirectMemoryClient( configuration );
}
@@ -44,7 +44,7 @@ public class DefaultDirectMemoryClient
private DirectMemoryHttpClient directMemoryHttpClient;
private DefaultDirectMemoryClient( DirectMemoryClientConfiguration configuration )
- throws DirectMemoryCacheException
+ throws DirectMemoryException
{
this.directMemoryHttpClient = configuration.getDirectMemoryHttpClient();
this.clientConfiguration = configuration;
@@ -52,66 +52,66 @@ public class DefaultDirectMemoryClient
@Override
- public DirectMemoryCacheResponse retrieve( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException, IOException, ClassNotFoundException, InstantiationException,
+ public DirectMemoryResponse retrieve( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException, IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException
{
- verifyPerRequestParameters( directMemoryCacheRequest );
- DirectMemoryCacheResponse response = this.directMemoryHttpClient.get( directMemoryCacheRequest );
+ verifyPerRequestParameters( directMemoryRequest );
+ DirectMemoryResponse response = this.directMemoryHttpClient.get( directMemoryRequest );
if ( response.isFound() && response.getCacheContent() != null && response.getCacheContent().length > 0 )
{
- Serializer serializer = directMemoryCacheRequest.getSerializer();
+ Serializer serializer = directMemoryRequest.getSerializer();
if ( serializer == null )
{
serializer = clientConfiguration.getSerializer();
}
response.setResponse(
- serializer.deserialize( response.getCacheContent(), directMemoryCacheRequest.getObjectClass() ) );
+ serializer.deserialize( response.getCacheContent(), directMemoryRequest.getObjectClass() ) );
}
return response;
}
@Override
- public Future<DirectMemoryCacheResponse> asyncRetrieve( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException
+ public Future<DirectMemoryResponse> asyncRetrieve( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException
{
- verifyPerRequestParameters( directMemoryCacheRequest );
- return this.directMemoryHttpClient.asyncGet( directMemoryCacheRequest );
+ verifyPerRequestParameters( directMemoryRequest );
+ return this.directMemoryHttpClient.asyncGet( directMemoryRequest );
}
@Override
- public void put( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException
+ public void put( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException
{
- verifyPerRequestParameters( directMemoryCacheRequest );
- this.directMemoryHttpClient.put( directMemoryCacheRequest );
+ verifyPerRequestParameters( directMemoryRequest );
+ this.directMemoryHttpClient.put( directMemoryRequest );
}
@Override
- public Future<Void> asyncPut( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException
+ public Future<Void> asyncPut( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException
{
- verifyPerRequestParameters( directMemoryCacheRequest );
- return this.directMemoryHttpClient.asyncPut( directMemoryCacheRequest );
+ verifyPerRequestParameters( directMemoryRequest );
+ return this.directMemoryHttpClient.asyncPut( directMemoryRequest );
}
@Override
- public DirectMemoryCacheResponse delete( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException
+ public DirectMemoryResponse delete( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException
{
- verifyPerRequestParameters( directMemoryCacheRequest );
- return this.directMemoryHttpClient.delete( directMemoryCacheRequest.setDeleteRequest( true ) );
+ verifyPerRequestParameters( directMemoryRequest );
+ return this.directMemoryHttpClient.delete( directMemoryRequest.setDeleteRequest( true ) );
}
@Override
- public Future<DirectMemoryCacheResponse> asyncDelete( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException
+ public Future<DirectMemoryResponse> asyncDelete( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException
{
- verifyPerRequestParameters( directMemoryCacheRequest );
- return this.directMemoryHttpClient.asyncDelete( directMemoryCacheRequest.setDeleteRequest( true ) );
+ verifyPerRequestParameters( directMemoryRequest );
+ return this.directMemoryHttpClient.asyncDelete( directMemoryRequest.setDeleteRequest( true ) );
}
- private void verifyPerRequestParameters(DirectMemoryCacheRequest request)
+ private void verifyPerRequestParameters(DirectMemoryRequest request)
{
if ( request.getSerializer() == null )
{
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClient.java Wed Feb 22 23:24:14 2012
@@ -18,9 +18,9 @@ package org.apache.directmemory.server.c
* under the License.
*/
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
-import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
+import org.apache.directmemory.server.commons.DirectMemoryResponse;
import java.io.IOException;
import java.util.concurrent.Future;
@@ -31,22 +31,22 @@ import java.util.concurrent.Future;
public interface DirectMemoryClient
{
- DirectMemoryCacheResponse retrieve( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException, IOException, ClassNotFoundException, InstantiationException,
+ DirectMemoryResponse retrieve( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException, IOException, ClassNotFoundException, InstantiationException,
IllegalAccessException;
- Future<DirectMemoryCacheResponse> asyncRetrieve( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException;
+ Future<DirectMemoryResponse> asyncRetrieve( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException;
- void put( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException;
+ void put( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException;
- Future<Void> asyncPut( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException;
+ Future<Void> asyncPut( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException;
- DirectMemoryCacheResponse delete( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException;
+ DirectMemoryResponse delete( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException;
- Future<DirectMemoryCacheResponse> asyncDelete( DirectMemoryCacheRequest directMemoryCacheRequest )
- throws DirectMemoryCacheException;
+ Future<DirectMemoryResponse> asyncDelete( DirectMemoryRequest directMemoryRequest )
+ throws DirectMemoryException;
}
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryClientConfiguration.java Wed Feb 22 23:24:14 2012
@@ -19,7 +19,7 @@ package org.apache.directmemory.server.c
*/
import org.apache.directmemory.serialization.Serializer;
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
+import org.apache.directmemory.server.commons.DirectMemoryException;
import org.apache.directmemory.server.commons.ExchangeType;
/**
@@ -100,7 +100,7 @@ public class DirectMemoryClientConfigura
public DirectMemoryClientConfiguration setDirectMemoryHttpClient(
DirectMemoryHttpClient directMemoryHttpClient )
- throws DirectMemoryCacheException
+ throws DirectMemoryException
{
this.directMemoryHttpClient = directMemoryHttpClient;
this.directMemoryHttpClient.configure( this );
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/DirectMemoryHttpClient.java Wed Feb 22 23:24:14 2012
@@ -18,9 +18,9 @@ package org.apache.directmemory.server.c
* under the License.
*/
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
-import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
+import org.apache.directmemory.server.commons.DirectMemoryResponse;
import java.util.concurrent.Future;
@@ -30,26 +30,26 @@ import java.util.concurrent.Future;
public interface DirectMemoryHttpClient
{
void configure( DirectMemoryClientConfiguration configuration )
- throws DirectMemoryCacheException;
+ throws DirectMemoryException;
- void put( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException;
+ void put( DirectMemoryRequest request )
+ throws DirectMemoryException;
- Future<Void> asyncPut( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException;
+ Future<Void> asyncPut( DirectMemoryRequest request )
+ throws DirectMemoryException;
- DirectMemoryCacheResponse get( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException;
+ DirectMemoryResponse get( DirectMemoryRequest request )
+ throws DirectMemoryException;
- Future<DirectMemoryCacheResponse> asyncGet( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException;
+ Future<DirectMemoryResponse> asyncGet( DirectMemoryRequest request )
+ throws DirectMemoryException;
- DirectMemoryCacheResponse delete( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException;
+ DirectMemoryResponse delete( DirectMemoryRequest request )
+ throws DirectMemoryException;
- Future<DirectMemoryCacheResponse> asyncDelete( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException;
+ Future<DirectMemoryResponse> asyncDelete( DirectMemoryRequest request )
+ throws DirectMemoryException;
}
Modified: incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-client/src/main/java/org/apache/directmemory/server/client/HttpClientDirectMemoryHttpClient.java Wed Feb 22 23:24:14 2012
@@ -18,9 +18,9 @@ package org.apache.directmemory.server.c
* under the License.
*/
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
-import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
+import org.apache.directmemory.server.commons.DirectMemoryResponse;
import org.apache.directmemory.server.commons.DirectMemoryHttpConstants;
import org.apache.directmemory.server.commons.ExchangeType;
import org.apache.http.HttpResponse;
@@ -64,7 +64,7 @@ public class HttpClientDirectMemoryHttpC
@Override
public void configure( DirectMemoryClientConfiguration configuration )
- throws DirectMemoryCacheException
+ throws DirectMemoryException
{
this.configuration = configuration;
ThreadSafeClientConnManager threadSafeClientConnManager = new ThreadSafeClientConnManager();
@@ -73,8 +73,8 @@ public class HttpClientDirectMemoryHttpC
}
@Override
- public void put( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ public void put( DirectMemoryRequest request )
+ throws DirectMemoryException
{
String uri = buildRequestWithKey( request );
log.debug( "put request to: {}", uri );
@@ -96,20 +96,20 @@ public class HttpClientDirectMemoryHttpC
StatusLine statusLine = response.getStatusLine();
if ( statusLine.getStatusCode() != 200 )
{
- throw new DirectMemoryCacheException(
+ throw new DirectMemoryException(
"put cache content return http code:'" + statusLine.getStatusCode() + "', reasonPhrase:"
+ statusLine.getReasonPhrase() );
}
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
}
@Override
- public Future<Void> asyncPut( final DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ public Future<Void> asyncPut( final DirectMemoryRequest request )
+ throws DirectMemoryException
{
return Executors.newSingleThreadExecutor().submit( new Callable<Void>()
{
@@ -124,8 +124,8 @@ public class HttpClientDirectMemoryHttpC
}
@Override
- public DirectMemoryCacheResponse get( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ public DirectMemoryResponse get( DirectMemoryRequest request )
+ throws DirectMemoryException
{
String uri = buildRequestWithKey( request );
@@ -143,30 +143,30 @@ public class HttpClientDirectMemoryHttpC
StatusLine statusLine = httpResponse.getStatusLine();
if ( statusLine.getStatusCode() == 204 )
{
- return new DirectMemoryCacheResponse().setFound( false );
+ return new DirectMemoryResponse().setFound( false );
}
if ( request.isDeleteRequest() )
{
- return new DirectMemoryCacheResponse().setFound( true ).setDeleted( true );
+ return new DirectMemoryResponse().setFound( true ).setDeleted( true );
}
return buildResponse( httpResponse.getEntity().getContent(), request ).setFound( true );
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
}
@Override
- public Future<DirectMemoryCacheResponse> asyncGet( final DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ public Future<DirectMemoryResponse> asyncGet( final DirectMemoryRequest request )
+ throws DirectMemoryException
{
- return Executors.newSingleThreadExecutor().submit( new Callable<DirectMemoryCacheResponse>()
+ return Executors.newSingleThreadExecutor().submit( new Callable<DirectMemoryResponse>()
{
@Override
- public DirectMemoryCacheResponse call()
+ public DirectMemoryResponse call()
throws Exception
{
return get( request );
@@ -175,8 +175,8 @@ public class HttpClientDirectMemoryHttpC
}
@Override
- public DirectMemoryCacheResponse delete( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ public DirectMemoryResponse delete( DirectMemoryRequest request )
+ throws DirectMemoryException
{
String uri = buildRequestWithKey( request );
@@ -192,26 +192,26 @@ public class HttpClientDirectMemoryHttpC
StatusLine statusLine = httpResponse.getStatusLine();
if ( statusLine.getStatusCode() == 204 )
{
- return new DirectMemoryCacheResponse().setFound( false ).setDeleted( false );
+ return new DirectMemoryResponse().setFound( false ).setDeleted( false );
}
- return new DirectMemoryCacheResponse().setFound( true ).setDeleted( true );
+ return new DirectMemoryResponse().setFound( true ).setDeleted( true );
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
}
@Override
- public Future<DirectMemoryCacheResponse> asyncDelete( final DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ public Future<DirectMemoryResponse> asyncDelete( final DirectMemoryRequest request )
+ throws DirectMemoryException
{
- return Executors.newSingleThreadExecutor().submit( new Callable<DirectMemoryCacheResponse>()
+ return Executors.newSingleThreadExecutor().submit( new Callable<DirectMemoryResponse>()
{
@Override
- public DirectMemoryCacheResponse call()
+ public DirectMemoryResponse call()
throws Exception
{
return delete( request );
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryExchange.java (from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryCacheExchange.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryExchange.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryExchange.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryCacheExchange.java&r1=1292581&r2=1292582&rev=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryCacheExchange.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryExchange.java Wed Feb 22 23:24:14 2012
@@ -23,7 +23,7 @@ import org.apache.directmemory.serializa
/**
* @author Olivier Lamy
*/
-public abstract class AbstractDirectMemoryCacheExchange<V>
+public abstract class AbstractDirectMemoryExchange<V>
{
private String key;
@@ -38,7 +38,7 @@ public abstract class AbstractDirectMemo
return key;
}
- public AbstractDirectMemoryCacheExchange setKey( String key )
+ public AbstractDirectMemoryExchange setKey( String key )
{
this.key = key;
return this;
@@ -49,7 +49,7 @@ public abstract class AbstractDirectMemo
return object;
}
- public AbstractDirectMemoryCacheExchange setObject( V object )
+ public AbstractDirectMemoryExchange setObject( V object )
{
this.object = object;
return this;
@@ -60,7 +60,7 @@ public abstract class AbstractDirectMemo
return serializer;
}
- public AbstractDirectMemoryCacheExchange setSerializer( Serializer serializer )
+ public AbstractDirectMemoryExchange setSerializer( Serializer serializer )
{
this.serializer = serializer;
return this;
@@ -71,7 +71,7 @@ public abstract class AbstractDirectMemo
return cacheContent;
}
- public AbstractDirectMemoryCacheExchange setCacheContent( byte[] cacheContent )
+ public AbstractDirectMemoryExchange setCacheContent( byte[] cacheContent )
{
this.cacheContent = cacheContent;
return this;
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryExchange.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/AbstractDirectMemoryExchange.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java (from r1292581, 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/DirectMemoryConstants.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheConstants.java&r1=1292581&r2=1292582&rev=1292582&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/DirectMemoryConstants.java Wed Feb 22 23:24:14 2012
@@ -21,7 +21,7 @@ package org.apache.directmemory.server.c
/**
* @author Olivier Lamy
*/
-public class DirectMemoryCacheConstants
+public class DirectMemoryConstants
{
public static final String CACHE_CONTENT_FIELD_NAME = "cacheContent";
@@ -38,7 +38,7 @@ public class DirectMemoryCacheConstants
public static final String SERIALIZER_FIELD_NAME = "serializer";
- private DirectMemoryCacheConstants()
+ private DirectMemoryConstants()
{
// no op
}
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryException.java (from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheException.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryException.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryException.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheException.java&r1=1292581&r2=1292582&rev=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheException.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryException.java Wed Feb 22 23:24:14 2012
@@ -21,15 +21,15 @@ package org.apache.directmemory.server.c
/**
* @author Olivier Lamy
*/
-public class DirectMemoryCacheException
+public class DirectMemoryException
extends Exception
{
- public DirectMemoryCacheException( String message )
+ public DirectMemoryException( String message )
{
super( message );
}
- public DirectMemoryCacheException( String message, Throwable throwable )
+ public DirectMemoryException( String message, Throwable throwable )
{
super( message, throwable );
}
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java (from r1292581, 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/DirectMemoryParser.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheParser.java&r1=1292581&r2=1292582&rev=1292582&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/DirectMemoryParser.java Wed Feb 22 23:24:14 2012
@@ -29,48 +29,48 @@ import java.io.InputStream;
/**
* @author Olivier Lamy
*/
-public class DirectMemoryCacheParser
+public class DirectMemoryParser
{
private JsonFactory jsonFactory;
- private static DirectMemoryCacheParser INSTANCE = new DirectMemoryCacheParser();
+ private static DirectMemoryParser INSTANCE = new DirectMemoryParser();
- private DirectMemoryCacheParser()
+ private DirectMemoryParser()
{
this.jsonFactory = new JsonFactory();
}
- public static DirectMemoryCacheParser instance()
+ public static DirectMemoryParser instance()
{
return INSTANCE;
}
- public DirectMemoryCacheRequest buildRequest( InputStream inputStream )
- throws DirectMemoryCacheException
+ public DirectMemoryRequest buildRequest( InputStream inputStream )
+ throws DirectMemoryException
{
try
{
JsonParser jp = this.jsonFactory.createJsonParser( inputStream );
- DirectMemoryCacheRequest rq = new DirectMemoryCacheRequest();
+ DirectMemoryRequest rq = new DirectMemoryRequest();
JsonToken jsonToken = jp.nextToken();
while ( jsonToken != JsonToken.END_OBJECT && jsonToken != null )
{
String fieldName = jp.getCurrentName();
- if ( DirectMemoryCacheConstants.KEY_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.KEY_FIELD_NAME.equals( fieldName ) )
{
rq.setKey( jp.getText() );
}
- if ( DirectMemoryCacheConstants.PUT_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.PUT_FIELD_NAME.equals( fieldName ) )
{
rq.setUpdate( jp.getValueAsBoolean() );
}
- if ( DirectMemoryCacheConstants.EXPIRES_IN_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.EXPIRES_IN_FIELD_NAME.equals( fieldName ) )
{
rq.setExpiresIn( jp.getValueAsInt() );
}
- if ( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.CACHE_CONTENT_FIELD_NAME.equals( fieldName ) )
{
// binaryValue need to go to nextToken
jp.nextToken();
@@ -85,41 +85,41 @@ public class DirectMemoryCacheParser
}
catch ( JsonParseException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
}
- public DirectMemoryCacheResponse buildResponse( InputStream inputStream )
- throws DirectMemoryCacheException
+ public DirectMemoryResponse buildResponse( InputStream inputStream )
+ throws DirectMemoryException
{
try
{
JsonParser jp = this.jsonFactory.createJsonParser( inputStream );
- DirectMemoryCacheResponse rs = new DirectMemoryCacheResponse();
+ DirectMemoryResponse rs = new DirectMemoryResponse();
JsonToken jsonToken = jp.nextToken();
while ( jsonToken != JsonToken.END_OBJECT && jsonToken != null)
{
String fieldName = jp.getCurrentName();
- if ( DirectMemoryCacheConstants.FOUND_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.FOUND_FIELD_NAME.equals( fieldName ) )
{
rs.setFound( jp.getValueAsBoolean() );
}
- if ( DirectMemoryCacheConstants.UPDATED_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.UPDATED_FIELD_NAME.equals( fieldName ) )
{
rs.setUpdated( jp.getValueAsBoolean() );
}
- if ( DirectMemoryCacheConstants.KEY_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.KEY_FIELD_NAME.equals( fieldName ) )
{
rs.setKey( jp.getText() );
}
- if ( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME.equals( fieldName ) )
+ if ( DirectMemoryConstants.CACHE_CONTENT_FIELD_NAME.equals( fieldName ) )
{
// binaryValue need to go to nextToken
jp.nextToken();
@@ -133,12 +133,12 @@ public class DirectMemoryCacheParser
}
catch ( JsonParseException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
}
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryRequest.java (from r1292581, 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/DirectMemoryRequest.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryRequest.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheRequest.java&r1=1292581&r2=1292582&rev=1292582&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/DirectMemoryRequest.java Wed Feb 22 23:24:14 2012
@@ -29,8 +29,8 @@ import org.apache.directmemory.serializa
*
* @author Olivier Lamy
*/
-public class DirectMemoryCacheRequest<V>
- extends AbstractDirectMemoryCacheExchange<V>
+public class DirectMemoryRequest<V>
+ extends AbstractDirectMemoryExchange<V>
{
/**
* to update/put content in the server
@@ -48,23 +48,23 @@ public class DirectMemoryCacheRequest<V>
*/
private boolean deleteRequest = false;
- public DirectMemoryCacheRequest( )
+ public DirectMemoryRequest()
{
// no op
}
- public DirectMemoryCacheRequest( String key )
+ public DirectMemoryRequest( String key )
{
this.setKey( key );
}
- public DirectMemoryCacheRequest( String key, Class<V> objectClass )
+ public DirectMemoryRequest( String key, Class<V> objectClass )
{
this.setKey( key );
this.setObjectClass( objectClass );
}
- public DirectMemoryCacheRequest( String key, V object )
+ public DirectMemoryRequest( String key, V object )
{
this.setKey( key );
this.setObject( object );
@@ -75,7 +75,7 @@ public class DirectMemoryCacheRequest<V>
return update;
}
- public DirectMemoryCacheRequest setUpdate( boolean update )
+ public DirectMemoryRequest setUpdate( boolean update )
{
this.update = update;
return this;
@@ -86,34 +86,34 @@ public class DirectMemoryCacheRequest<V>
return expiresIn;
}
- public DirectMemoryCacheRequest setExpiresIn( int expiresIn )
+ public DirectMemoryRequest setExpiresIn( int expiresIn )
{
this.expiresIn = expiresIn;
return this;
}
- public DirectMemoryCacheRequest setKey( String key )
+ public DirectMemoryRequest setKey( String key )
{
super.setKey( key );
return this;
}
- public DirectMemoryCacheRequest setObject( V object )
+ public DirectMemoryRequest setObject( V object )
{
super.setObject( object );
return this;
}
- public DirectMemoryCacheRequest setSerializer( Serializer serializer )
+ public DirectMemoryRequest setSerializer( Serializer serializer )
{
super.setSerializer( serializer );
return this;
}
- public DirectMemoryCacheRequest setCacheContent( byte[] cacheContent )
+ public DirectMemoryRequest setCacheContent( byte[] cacheContent )
{
super.setCacheContent( cacheContent );
return this;
@@ -124,7 +124,7 @@ public class DirectMemoryCacheRequest<V>
return deleteRequest;
}
- public DirectMemoryCacheRequest setDeleteRequest( boolean deleteRequest )
+ public DirectMemoryRequest setDeleteRequest( boolean deleteRequest )
{
this.deleteRequest = deleteRequest;
return this;
@@ -135,7 +135,7 @@ public class DirectMemoryCacheRequest<V>
return exchangeType;
}
- public DirectMemoryCacheRequest setExchangeType( ExchangeType exchangeType )
+ public DirectMemoryRequest setExchangeType( ExchangeType exchangeType )
{
this.exchangeType = exchangeType;
return this;
@@ -146,7 +146,7 @@ public class DirectMemoryCacheRequest<V>
return objectClass;
}
- public DirectMemoryCacheRequest setObjectClass( Class<V> objectClass )
+ public DirectMemoryRequest setObjectClass( Class<V> objectClass )
{
this.objectClass = objectClass;
return this;
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryRequest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java (from r1292581, 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/DirectMemoryResponse.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheResponse.java&r1=1292581&r2=1292582&rev=1292582&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/DirectMemoryResponse.java Wed Feb 22 23:24:14 2012
@@ -26,8 +26,8 @@ package org.apache.directmemory.server.c
*
* @author Olivier Lamy
*/
-public class DirectMemoryCacheResponse<V>
- extends AbstractDirectMemoryCacheExchange
+public class DirectMemoryResponse<V>
+ extends AbstractDirectMemoryExchange
{
private boolean found;
@@ -42,7 +42,7 @@ public class DirectMemoryCacheResponse<V
return found;
}
- public DirectMemoryCacheResponse setFound( boolean found )
+ public DirectMemoryResponse setFound( boolean found )
{
this.found = found;
return this;
@@ -53,19 +53,19 @@ public class DirectMemoryCacheResponse<V
return updated;
}
- public DirectMemoryCacheResponse setUpdated( boolean updated )
+ public DirectMemoryResponse setUpdated( boolean updated )
{
this.updated = updated;
return this;
}
- public DirectMemoryCacheResponse setCacheContent( byte[] cacheContent )
+ public DirectMemoryResponse setCacheContent( byte[] cacheContent )
{
super.setCacheContent( cacheContent );
return this;
}
- public DirectMemoryCacheResponse setKey( String key )
+ public DirectMemoryResponse setKey( String key )
{
super.setKey( key );
return this;
@@ -76,7 +76,7 @@ public class DirectMemoryCacheResponse<V
return deleted;
}
- public DirectMemoryCacheResponse setDeleted( boolean deleted )
+ public DirectMemoryResponse setDeleted( boolean deleted )
{
this.deleted = deleted;
return this;
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java (from r1292581, 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/DirectMemoryWriter.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriter.java&r1=1292581&r2=1292582&rev=1292582&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/DirectMemoryWriter.java Wed Feb 22 23:24:14 2012
@@ -30,26 +30,26 @@ import java.io.StringWriter;
/**
* @author Olivier Lamy
*/
-public class DirectMemoryCacheWriter
+public class DirectMemoryWriter
{
private JsonFactory jsonFactory;
- private static final DirectMemoryCacheWriter INSTANCE = new DirectMemoryCacheWriter();
+ private static final DirectMemoryWriter INSTANCE = new DirectMemoryWriter();
private Logger log = LoggerFactory.getLogger( getClass() );
- public static DirectMemoryCacheWriter instance()
+ public static DirectMemoryWriter instance()
{
return INSTANCE;
}
- private DirectMemoryCacheWriter()
+ private DirectMemoryWriter()
{
this.jsonFactory = new JsonFactory();
}
- public String generateJsonRequest( DirectMemoryCacheRequest request )
- throws DirectMemoryCacheException
+ public String generateJsonRequest( DirectMemoryRequest request )
+ throws DirectMemoryException
{
// TODO configure a minimum size for the writer
StringWriter stringWriter = new StringWriter();
@@ -60,11 +60,11 @@ public class DirectMemoryCacheWriter
g.writeStartObject();
- g.writeStringField( DirectMemoryCacheConstants.KEY_FIELD_NAME, request.getKey() );
+ g.writeStringField( DirectMemoryConstants.KEY_FIELD_NAME, request.getKey() );
- g.writeBooleanField( DirectMemoryCacheConstants.PUT_FIELD_NAME, request.isUpdate() );
+ g.writeBooleanField( DirectMemoryConstants.PUT_FIELD_NAME, request.isUpdate() );
- g.writeNumberField( DirectMemoryCacheConstants.EXPIRES_IN_FIELD_NAME, request.getExpiresIn() );
+ g.writeNumberField( DirectMemoryConstants.EXPIRES_IN_FIELD_NAME, request.getExpiresIn() );
// FIXME take care of NPE
// cache content generation
@@ -74,12 +74,12 @@ public class DirectMemoryCacheWriter
? request.getSerializer().serialize( request.getObject() )
: request.getCacheContent();
- g.writeFieldName( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME );
+ g.writeFieldName( DirectMemoryConstants.CACHE_CONTENT_FIELD_NAME );
g.writeBinary( bytes );
if ( serializer != null )
{
- g.writeStringField( DirectMemoryCacheConstants.SERIALIZER_FIELD_NAME, serializer.getClass().getName() );
+ g.writeStringField( DirectMemoryConstants.SERIALIZER_FIELD_NAME, serializer.getClass().getName() );
}
g.writeEndObject();
@@ -87,14 +87,14 @@ public class DirectMemoryCacheWriter
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
return stringWriter.toString();
}
- public String generateJsonResponse( DirectMemoryCacheResponse response )
- throws DirectMemoryCacheException
+ public String generateJsonResponse( DirectMemoryResponse response )
+ throws DirectMemoryException
{
// TODO configure a minimum size for the writer
@@ -107,15 +107,15 @@ public class DirectMemoryCacheWriter
g.writeStartObject();
- g.writeBooleanField( DirectMemoryCacheConstants.FOUND_FIELD_NAME, response.isFound() );
+ g.writeBooleanField( DirectMemoryConstants.FOUND_FIELD_NAME, response.isFound() );
- g.writeBooleanField( DirectMemoryCacheConstants.UPDATED_FIELD_NAME, response.isUpdated() );
+ g.writeBooleanField( DirectMemoryConstants.UPDATED_FIELD_NAME, response.isUpdated() );
- g.writeStringField( DirectMemoryCacheConstants.KEY_FIELD_NAME, response.getKey() );
+ g.writeStringField( DirectMemoryConstants.KEY_FIELD_NAME, response.getKey() );
if ( response.getCacheContent() != null && response.getCacheContent().length > 0 )
{
- g.writeFieldName( DirectMemoryCacheConstants.CACHE_CONTENT_FIELD_NAME );
+ g.writeFieldName( DirectMemoryConstants.CACHE_CONTENT_FIELD_NAME );
g.writeBinary( response.getCacheContent() );
}
@@ -125,7 +125,7 @@ public class DirectMemoryCacheWriter
}
catch ( IOException e )
{
- throw new DirectMemoryCacheException( e.getMessage(), e );
+ throw new DirectMemoryException( e.getMessage(), e );
}
return stringWriter.toString();
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java (from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheParserTest.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheParserTest.java&r1=1292581&r2=1292582&rev=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheParserTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java Wed Feb 22 23:24:14 2012
@@ -28,7 +28,7 @@ import static org.junit.Assert.*;
/**
* @author Olivier Lamy
*/
-public class DirectMemoryCacheParserTest
+public class DirectMemoryParserTest
{
@Test
public void parseRequest()
@@ -36,7 +36,7 @@ public class DirectMemoryCacheParserTest
{
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( "cache-rq.json" );
assertNotNull( is );
- DirectMemoryCacheRequest dmRq = DirectMemoryCacheParser.instance().buildRequest( is );
+ DirectMemoryRequest dmRq = DirectMemoryParser.instance().buildRequest( is );
assertNotNull( dmRq );
assertEquals( "101", dmRq.getKey() );
@@ -50,7 +50,7 @@ public class DirectMemoryCacheParserTest
{
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( "cache-rs.json" );
assertNotNull( is );
- DirectMemoryCacheResponse dmRs = DirectMemoryCacheParser.instance().buildResponse( is );
+ DirectMemoryResponse dmRs = DirectMemoryParser.instance().buildResponse( is );
assertNotNull( dmRs );
assertEquals( "foo", dmRs.getKey() );
@@ -64,7 +64,7 @@ public class DirectMemoryCacheParserTest
throws Exception
{
InputStream is = new ByteArrayInputStream( new byte[0] );
- DirectMemoryCacheRequest dmRq = DirectMemoryCacheParser.instance().buildRequest( is );
+ DirectMemoryRequest dmRq = DirectMemoryParser.instance().buildRequest( is );
assertNotNull( dmRq );
assertNull( dmRq.getCacheContent() );
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java (from r1292581, incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java)
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java?p2=incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java&p1=incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java&r1=1292581&r2=1292582&rev=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryCacheWriterTest.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java Wed Feb 22 23:24:14 2012
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertNot
/**
* @author Olivier Lamy
*/
-public class DirectMemoryCacheWriterTest
+public class DirectMemoryWriterTest
{
private Logger log = LoggerFactory.getLogger( getClass() );
@@ -42,12 +42,12 @@ public class DirectMemoryCacheWriterTest
public void writeRequestWithString()
throws Exception
{
- DirectMemoryCacheRequest dmRq =
- new DirectMemoryCacheRequest().setKey( "101" ).setUpdate( true ).setExpiresIn( 123 ).setCacheContent(
+ DirectMemoryRequest dmRq =
+ new DirectMemoryRequest().setKey( "101" ).setUpdate( true ).setExpiresIn( 123 ).setCacheContent(
"foo bar".getBytes() );
- String rq = DirectMemoryCacheWriter.instance().generateJsonRequest( dmRq );
+ String rq = DirectMemoryWriter.instance().generateJsonRequest( dmRq );
- dmRq = DirectMemoryCacheParser.instance().buildRequest( new ByteArrayInputStream( rq.getBytes() ) );
+ dmRq = DirectMemoryParser.instance().buildRequest( new ByteArrayInputStream( rq.getBytes() ) );
assertNotNull( dmRq );
assertEquals( "101", dmRq.getKey() );
@@ -65,13 +65,13 @@ public class DirectMemoryCacheWriterTest
Serializer serializer = SerializerFactory.createNewSerializer();
- DirectMemoryCacheRequest dmRq =
- new DirectMemoryCacheRequest().setKey( "101" ).setUpdate( true ).setExpiresIn( 123 ).setObject(
+ DirectMemoryRequest dmRq =
+ new DirectMemoryRequest().setKey( "101" ).setUpdate( true ).setExpiresIn( 123 ).setObject(
wine ).setSerializer( serializer );
- String rq = DirectMemoryCacheWriter.instance().generateJsonRequest( dmRq );
+ String rq = DirectMemoryWriter.instance().generateJsonRequest( dmRq );
log.info( "rq:" + rq );
- dmRq = DirectMemoryCacheParser.instance().buildRequest( new ByteArrayInputStream( rq.getBytes() ) );
+ dmRq = DirectMemoryParser.instance().buildRequest( new ByteArrayInputStream( rq.getBytes() ) );
assertNotNull( dmRq );
assertEquals( "101", dmRq.getKey() );
@@ -87,12 +87,12 @@ public class DirectMemoryCacheWriterTest
public void writeResponseWithString()
throws Exception
{
- DirectMemoryCacheResponse rs =
- new DirectMemoryCacheResponse().setKey( "101" ).setFound( true ).setUpdated( false ).setCacheContent(
+ DirectMemoryResponse rs =
+ new DirectMemoryResponse().setKey( "101" ).setFound( true ).setUpdated( false ).setCacheContent(
"foo bar".getBytes() );
- String jsonRs = DirectMemoryCacheWriter.instance().generateJsonResponse( rs );
+ String jsonRs = DirectMemoryWriter.instance().generateJsonResponse( rs );
- rs = DirectMemoryCacheParser.instance().buildResponse( new ByteArrayInputStream( jsonRs.getBytes() ) );
+ rs = DirectMemoryParser.instance().buildResponse( new ByteArrayInputStream( jsonRs.getBytes() ) );
assertNotNull( rs );
log.info( "jsonRs:" + jsonRs );
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheContentTypeHandler.java Wed Feb 22 23:24:14 2012
@@ -18,8 +18,8 @@ package org.apache.directmemory.server.s
* under the License.
*/
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -30,9 +30,9 @@ import java.io.IOException;
*/
public interface CacheContentTypeHandler
{
- byte[] handleGet( DirectMemoryCacheRequest request, byte[] cacheResponseContent, HttpServletResponse response )
- throws DirectMemoryCacheException, IOException;
+ byte[] handleGet( DirectMemoryRequest request, byte[] cacheResponseContent, HttpServletResponse response )
+ throws DirectMemoryException, IOException;
- DirectMemoryCacheRequest handlePut( HttpServletRequest request, HttpServletResponse response )
- throws DirectMemoryCacheException, IOException;
+ DirectMemoryRequest handlePut( HttpServletRequest request, HttpServletResponse response )
+ throws DirectMemoryException, IOException;
}
Modified: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/CacheServlet.java Wed Feb 22 23:24:14 2012
@@ -22,9 +22,9 @@ import org.apache.commons.lang.StringUti
import org.apache.directmemory.cache.CacheService;
import org.apache.directmemory.cache.CacheServiceImpl;
import org.apache.directmemory.memory.Pointer;
+import org.apache.directmemory.server.commons.DirectMemoryException;
import org.apache.directmemory.server.commons.DirectMemoryHttpConstants;
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,7 +101,7 @@ public class CacheServlet
String servletPath = req.getServletPath();
String key = retrieveKeyFromPath( path );
- DirectMemoryCacheRequest cacheRequest = null;
+ DirectMemoryRequest request = null;
CacheContentTypeHandler contentTypeHandler = findPutCacheContentTypeHandler( req, resp );
@@ -115,9 +115,9 @@ public class CacheServlet
}
try
{
- cacheRequest = contentTypeHandler.handlePut( req, resp );
+ request = contentTypeHandler.handlePut( req, resp );
}
- catch ( DirectMemoryCacheException e )
+ catch ( DirectMemoryException e )
{
resp.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage() );
return;
@@ -125,7 +125,7 @@ public class CacheServlet
//if exists free first ?
//if ( cacheService.retrieveByteArray( key ) == null )
- cacheService.putByteArray( key, cacheRequest.getCacheContent(), cacheRequest.getExpiresIn() );
+ cacheService.putByteArray( key, request.getCacheContent(), request.getExpiresIn() );
}
protected CacheContentTypeHandler findPutCacheContentTypeHandler( HttpServletRequest req,
@@ -207,10 +207,10 @@ public class CacheServlet
try
{
byte[] respBytes =
- contentTypeHandler.handleGet( new DirectMemoryCacheRequest().setKey( key ), bytes, resp );
+ contentTypeHandler.handleGet( new DirectMemoryRequest().setKey( key ), bytes, resp );
resp.getOutputStream().write( respBytes );
}
- catch ( DirectMemoryCacheException e )
+ catch ( DirectMemoryException e )
{
resp.sendError( HttpServletResponse.SC_INTERNAL_SERVER_ERROR, e.getMessage() );
}
Modified: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JavaSerializedCacheContentTypeHandler.java Wed Feb 22 23:24:14 2012
@@ -21,8 +21,8 @@ package org.apache.directmemory.server.s
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.directmemory.server.commons.DirectMemoryHttpConstants;
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,21 +39,21 @@ public class JavaSerializedCacheContentT
private Logger log = LoggerFactory.getLogger( getClass() );
@Override
- public byte[] handleGet( DirectMemoryCacheRequest request, byte[] cacheResponseContent, HttpServletResponse resp )
- throws DirectMemoryCacheException, IOException
+ public byte[] handleGet( DirectMemoryRequest request, byte[] cacheResponseContent, HttpServletResponse resp )
+ throws DirectMemoryException, IOException
{
resp.setContentType( DirectMemoryHttpConstants.JAVA_SERIALIZED_OBJECT_CONTENT_TYPE_HEADER );
return cacheResponseContent;
}
@Override
- public DirectMemoryCacheRequest handlePut( HttpServletRequest request, HttpServletResponse response )
- throws DirectMemoryCacheException, IOException
+ public DirectMemoryRequest handlePut( HttpServletRequest request, HttpServletResponse response )
+ throws DirectMemoryException, IOException
{
String expiresInHeader = request.getHeader( DirectMemoryHttpConstants.EXPIRES_IN_HTTP_HEADER );
int expiresIn = StringUtils.isEmpty( expiresInHeader ) ? 0 : Integer.valueOf( expiresInHeader );
log.debug( "expiresIn: {} for header value: {}", expiresIn, expiresInHeader );
- return new DirectMemoryCacheRequest().setExpiresIn( expiresIn ).setCacheContent(
+ return new DirectMemoryRequest().setExpiresIn( expiresIn ).setCacheContent(
IOUtils.toByteArray( request.getInputStream() ) );
}
}
Modified: incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java?rev=1292582&r1=1292581&r2=1292582&view=diff
==============================================================================
--- incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java (original)
+++ incubator/directmemory/trunk/server/directmemory-server/src/main/java/org/apache/directmemory/server/services/JsonCacheContentTypeHandler.java Wed Feb 22 23:24:14 2012
@@ -18,11 +18,11 @@ package org.apache.directmemory.server.s
* under the License.
*/
-import org.apache.directmemory.server.commons.DirectMemoryCacheException;
-import org.apache.directmemory.server.commons.DirectMemoryCacheParser;
-import org.apache.directmemory.server.commons.DirectMemoryCacheRequest;
-import org.apache.directmemory.server.commons.DirectMemoryCacheResponse;
-import org.apache.directmemory.server.commons.DirectMemoryCacheWriter;
+import org.apache.directmemory.server.commons.DirectMemoryException;
+import org.apache.directmemory.server.commons.DirectMemoryParser;
+import org.apache.directmemory.server.commons.DirectMemoryRequest;
+import org.apache.directmemory.server.commons.DirectMemoryResponse;
+import org.apache.directmemory.server.commons.DirectMemoryWriter;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -36,29 +36,29 @@ public class JsonCacheContentTypeHandler
implements CacheContentTypeHandler
{
- private DirectMemoryCacheParser parser = DirectMemoryCacheParser.instance();
+ private DirectMemoryParser parser = DirectMemoryParser.instance();
- private DirectMemoryCacheWriter writer = DirectMemoryCacheWriter.instance();
+ private DirectMemoryWriter writer = DirectMemoryWriter.instance();
@Override
- public byte[] handleGet( DirectMemoryCacheRequest request, byte[] cacheResponseContent, HttpServletResponse resp )
- throws DirectMemoryCacheException, IOException
+ public byte[] handleGet( DirectMemoryRequest request, byte[] cacheResponseContent, HttpServletResponse resp )
+ throws DirectMemoryException, IOException
{
- DirectMemoryCacheResponse response =
- new DirectMemoryCacheResponse().setKey( request.getKey() ).setCacheContent( cacheResponseContent );
+ DirectMemoryResponse response =
+ new DirectMemoryResponse().setKey( request.getKey() ).setCacheContent( cacheResponseContent );
String json = writer.generateJsonResponse( response );
resp.setContentType( MediaType.APPLICATION_JSON );
return json.getBytes();
}
@Override
- public DirectMemoryCacheRequest handlePut( HttpServletRequest req, HttpServletResponse resp )
- throws DirectMemoryCacheException, IOException
+ public DirectMemoryRequest handlePut( HttpServletRequest req, HttpServletResponse resp )
+ throws DirectMemoryException, IOException
{
// application/json
- DirectMemoryCacheRequest cacheRequest = parser.buildRequest( req.getInputStream() );
- return cacheRequest;
+ DirectMemoryRequest request = parser.buildRequest( req.getInputStream() );
+ return request;
}
}