Author: olamy
Date: Tue Feb 28 22:31:45 2012
New Revision: 1294869
URL: http://svn.apache.org/viewvc?rev=1294869&view=rev
Log:
use a bean rather than Boolean to be able to add more datas in the future
Modified:
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/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-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
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=1294869&r1=1294868&r2=1294869&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
Tue Feb 28 22:31:45 2012
@@ -80,7 +80,7 @@ public class DefaultDirectMemoryClient
}
@Override
- public Boolean put( DirectMemoryRequest directMemoryRequest )
+ public DirectMemoryResponse put( DirectMemoryRequest directMemoryRequest )
throws DirectMemoryException
{
verifyPerRequestParameters( directMemoryRequest );
@@ -88,7 +88,7 @@ public class DefaultDirectMemoryClient
}
@Override
- public Future<Boolean> asyncPut( DirectMemoryRequest directMemoryRequest )
+ public Future<DirectMemoryResponse> asyncPut( DirectMemoryRequest
directMemoryRequest )
throws DirectMemoryException
{
verifyPerRequestParameters( directMemoryRequest );
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=1294869&r1=1294868&r2=1294869&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
Tue Feb 28 22:31:45 2012
@@ -52,14 +52,14 @@ public interface DirectMemoryClient
throws DirectMemoryException;
- Boolean put( DirectMemoryRequest directMemoryRequest )
+ DirectMemoryResponse put( DirectMemoryRequest directMemoryRequest )
throws DirectMemoryException;
/**
*
* same as put.
*/
- Future<Boolean> asyncPut( DirectMemoryRequest directMemoryRequest )
+ Future<DirectMemoryResponse> asyncPut( DirectMemoryRequest
directMemoryRequest )
throws DirectMemoryException;
/**
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=1294869&r1=1294868&r2=1294869&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
Tue Feb 28 22:31:45 2012
@@ -32,10 +32,10 @@ public interface DirectMemoryHttpClient
void configure( DirectMemoryClientConfiguration configuration )
throws DirectMemoryException;
- Boolean put( DirectMemoryRequest request )
+ DirectMemoryResponse put( DirectMemoryRequest request )
throws DirectMemoryException;
- Future<Boolean> asyncPut( DirectMemoryRequest request )
+ Future<DirectMemoryResponse> asyncPut( DirectMemoryRequest request )
throws DirectMemoryException;
DirectMemoryResponse get( DirectMemoryRequest request )
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=1294869&r1=1294868&r2=1294869&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
Tue Feb 28 22:31:45 2012
@@ -73,7 +73,7 @@ public class HttpClientDirectMemoryHttpC
}
@Override
- public Boolean put( DirectMemoryRequest request )
+ public DirectMemoryResponse put( DirectMemoryRequest request )
throws DirectMemoryException
{
String uri = buildRequestWithKey( request );
@@ -103,9 +103,9 @@ public class HttpClientDirectMemoryHttpC
switch ( statusLine.getStatusCode() )
{
case 200:
- return Boolean.TRUE;
+ return new DirectMemoryResponse().setStored( Boolean.TRUE
);
case 204:
- return Boolean.FALSE;
+ return new DirectMemoryResponse().setStored( Boolean.FALSE
);
default:
throw new DirectMemoryException(
"put cache content return http code:'" +
statusLine.getStatusCode() + "', reasonPhrase:"
@@ -121,13 +121,13 @@ public class HttpClientDirectMemoryHttpC
}
@Override
- public Future<Boolean> asyncPut( final DirectMemoryRequest request )
+ public Future<DirectMemoryResponse> asyncPut( final DirectMemoryRequest
request )
throws DirectMemoryException
{
- return Executors.newSingleThreadExecutor().submit( new
Callable<Boolean>()
+ return Executors.newSingleThreadExecutor().submit( new
Callable<DirectMemoryResponse>()
{
@Override
- public Boolean call()
+ public DirectMemoryResponse call()
throws Exception
{
return put( request );
Modified:
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java?rev=1294869&r1=1294868&r2=1294869&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryConstants.java
Tue Feb 28 22:31:45 2012
@@ -32,8 +32,6 @@ public class DirectMemoryConstants
public static final String EXPIRES_IN_FIELD_NAME = "expiresIn";
- public static final String UPDATED_FIELD_NAME = "updated";
-
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/DirectMemoryParser.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java?rev=1294869&r1=1294868&r2=1294869&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryParser.java
Tue Feb 28 22:31:45 2012
@@ -111,10 +111,6 @@ public class DirectMemoryParser
{
rs.setFound( jp.getValueAsBoolean() );
}
- if ( DirectMemoryConstants.UPDATED_FIELD_NAME.equals(
fieldName ) )
- {
- rs.setUpdated( jp.getValueAsBoolean() );
- }
if ( DirectMemoryConstants.KEY_FIELD_NAME.equals( fieldName ) )
{
rs.setKey( jp.getText() );
Modified:
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java?rev=1294869&r1=1294868&r2=1294869&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryResponse.java
Tue Feb 28 22:31:45 2012
@@ -31,7 +31,7 @@ public class DirectMemoryResponse<V>
{
private boolean found;
- private boolean updated;
+ private boolean stored;
private boolean deleted = false;
@@ -48,14 +48,14 @@ public class DirectMemoryResponse<V>
return this;
}
- public boolean isUpdated()
+ public boolean isStored()
{
- return updated;
+ return stored;
}
- public DirectMemoryResponse setUpdated( boolean updated )
+ public DirectMemoryResponse setStored( boolean stored )
{
- this.updated = updated;
+ this.stored = stored;
return this;
}
Modified:
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java?rev=1294869&r1=1294868&r2=1294869&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-commons/src/main/java/org/apache/directmemory/server/commons/DirectMemoryWriter.java
Tue Feb 28 22:31:45 2012
@@ -109,8 +109,6 @@ public class DirectMemoryWriter
g.writeBooleanField( DirectMemoryConstants.FOUND_FIELD_NAME,
response.isFound() );
- g.writeBooleanField( DirectMemoryConstants.UPDATED_FIELD_NAME,
response.isUpdated() );
-
g.writeStringField( DirectMemoryConstants.KEY_FIELD_NAME,
response.getKey() );
if ( response.getCacheContent() != null &&
response.getCacheContent().length > 0 )
Modified:
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java?rev=1294869&r1=1294868&r2=1294869&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryParserTest.java
Tue Feb 28 22:31:45 2012
@@ -55,7 +55,7 @@ public class DirectMemoryParserTest
assertEquals( "foo", dmRs.getKey() );
assertEquals( true, dmRs.isFound() );
- assertEquals( false, dmRs.isUpdated() );
+ assertEquals( false, dmRs.isStored() );
assertEquals( "foo bar", new String( dmRs.getCacheContent() ) );
}
Modified:
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java?rev=1294869&r1=1294868&r2=1294869&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server-commons/src/test/java/org/apache/directmemory/server/commons/DirectMemoryWriterTest.java
Tue Feb 28 22:31:45 2012
@@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.*;
+
/**
* @author Olivier Lamy
@@ -51,7 +51,7 @@ public class DirectMemoryWriterTest
assertNotNull( dmRq );
assertEquals( "101", dmRq.getKey() );
- assertEquals( true, dmRq.isUpdate() );
+ assertTrue( dmRq.isUpdate() );
assertEquals( 123, dmRq.getExpiresIn() );
assertEquals( "foo bar", new String( dmRq.getCacheContent() ) );
}
@@ -75,7 +75,7 @@ public class DirectMemoryWriterTest
assertNotNull( dmRq );
assertEquals( "101", dmRq.getKey() );
- assertEquals( true, dmRq.isUpdate() );
+ assertTrue( dmRq.isUpdate() );
assertEquals( 123, dmRq.getExpiresIn() );
wine = serializer.deserialize( dmRq.getCacheContent(), Wine.class );
@@ -88,7 +88,7 @@ public class DirectMemoryWriterTest
throws Exception
{
DirectMemoryResponse rs =
- new DirectMemoryResponse().setKey( "101" ).setFound( true
).setUpdated( false ).setCacheContent(
+ new DirectMemoryResponse().setKey( "101" ).setFound( true
).setStored( false ).setCacheContent(
"foo bar".getBytes() );
String jsonRs = DirectMemoryWriter.instance().generateJsonResponse( rs
);
@@ -98,8 +98,8 @@ public class DirectMemoryWriterTest
log.info( "jsonRs:" + jsonRs );
assertEquals( "101", rs.getKey() );
- assertEquals( true, rs.isFound() );
- assertEquals( false, rs.isUpdated() );
+ assertTrue( rs.isFound() );
+ assertFalse( rs.isStored() );
assertEquals( "foo bar", new String( rs.getCacheContent() ) );
}
}
Modified:
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
URL:
http://svn.apache.org/viewvc/incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java?rev=1294869&r1=1294868&r2=1294869&view=diff
==============================================================================
---
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
(original)
+++
incubator/directmemory/trunk/server/directmemory-server/src/test/java/org/apache/directmemory/server/services/AbstractServletWithClientTest.java
Tue Feb 28 22:31:45 2012
@@ -108,7 +108,7 @@ public abstract class AbstractServletWit
// START SNIPPET: client-put
Wine bordeaux = new Wine( "Bordeaux", "very great wine" );
- assertTrue( client.put( new DirectMemoryRequest<Wine>( "bordeaux",
bordeaux ) ) );
+ assertTrue( client.put( new DirectMemoryRequest<Wine>( "bordeaux",
bordeaux ) ).isStored() );
// END SNIPPET: client-put
@@ -143,7 +143,7 @@ public abstract class AbstractServletWit
{
Wine bordeaux = new Wine( "Bordeaux", "very great wine" );
- assertTrue( client.put( new DirectMemoryRequest<Wine>( "bordeaux",
bordeaux ) ) );
+ assertTrue( client.put( new DirectMemoryRequest<Wine>( "bordeaux",
bordeaux ) ).isStored() );
DirectMemoryResponse<Wine> response = client.retrieve( new
DirectMemoryRequest( "bordeaux", Wine.class ) );
@@ -181,7 +181,7 @@ public abstract class AbstractServletWit
DirectMemoryResponse deleteResponse = client.delete( new
DirectMemoryRequest<Wine>( "bordeaux" ) );
Wine bordeaux = new Wine( "Bordeaux", "very great wine" );
- assertTrue( client.put( new DirectMemoryRequest<Wine>( "bordeaux",
bordeaux ).setExpiresIn( 1000 ) ) );
+ assertTrue( client.put( new DirectMemoryRequest<Wine>( "bordeaux",
bordeaux ).setExpiresIn( 1000 ) ).isStored() );
DirectMemoryRequest rq = new DirectMemoryRequest( "bordeaux",
Wine.class );
@@ -210,6 +210,6 @@ public abstract class AbstractServletWit
throws Exception
{
- assertFalse( client.put( new DirectMemoryRequest<String>( "foo",
hugeStr.toString() ) ) );
+ assertFalse( client.put( new DirectMemoryRequest<String>( "foo",
hugeStr.toString() ) ).isStored() );
}
}
