final versio to 1.1.0

otaviojava · Sep 22, 2012 · 97da28b · 97da28b
1 parent 01b9d17
commit 97da28b
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.easycassandra</groupId>
     <artifactId>EasyCassandra</artifactId>
-    <version>1.1.0-RC2</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <name>EasyCassandra</name>

diff --git a/src/main/java/org/easycassandra/persistence/EasyCassandraManager.java b/src/main/java/org/easycassandra/persistence/EasyCassandraManager.java
@@ -201,7 +201,7 @@ public static Persistence getPersistence(String keySpace, String host,
     	if(client==null){
     		return null;
     	}
-       return new PersistenceSingleClient(client, referenceSuperColunms, keySpace);
+       return new PersistenceSingle(client, referenceSuperColunms, keySpace);
 
     }
     /**
@@ -211,7 +211,7 @@ public static Persistence getPersistence(String keySpace, String host,
      */
 	public static Persistence getPersistenceRandom(String keySpace) {
 
-		return new PersistenceRandomClient(getListClient(keySpace),referenceSuperColunms, keySpace);
+		return new PersistenceRandom(getListClient(keySpace),referenceSuperColunms, keySpace);
 }
 	/**
      * get the Persistence with many clients and sequential access
@@ -220,7 +220,7 @@ public static Persistence getPersistenceRandom(String keySpace) {
      */
 	public static Persistence getPersistenceSequencial(String keySpace) {
 
-		return new PersistenceSequencialClient(getListClient(keySpace),referenceSuperColunms, keySpace);
+		return new PersistenceSequencial(getListClient(keySpace),referenceSuperColunms, keySpace);
 }
 
 	/**

diff --git a/src/main/java/org/easycassandra/persistence/Persistence.java b/src/main/java/org/easycassandra/persistence/Persistence.java
@@ -752,5 +752,11 @@ public int hashCode() {
 
     }
 
+    /**
+	 * Return the number of connections in this client
+	 * @return number of connection
+	 */
+	public abstract int size();
+
 
 }
diff --git a/.../persistence/PersistenceRandomClient.java → ...sandra/persistence/PersistenceRandom.java b/.../persistence/PersistenceRandomClient.java → ...sandra/persistence/PersistenceRandom.java
@@ -26,10 +26,10 @@
  * @author otavio
  *
  */
-public class PersistenceRandomClient extends Persistence{
+public class PersistenceRandom extends Persistence{
 
    	private Random random;
-	PersistenceRandomClient(List<Client> clients, AtomicReference<ColumnFamilyIds> superColumnsRef,
+	PersistenceRandom(List<Client> clients, AtomicReference<ColumnFamilyIds> superColumnsRef,
 			String keySpace) {
 		super(superColumnsRef, keySpace);
 		this.clients=clients;
@@ -46,6 +46,7 @@ public Client getClient() {
 	 * Return the number of connections in this client
 	 * @return number of connection
 	 */
+        @Override
 	public int size(){
 
 		return clients.size();

diff --git a/...sistence/PersistenceSequencialClient.java → ...ra/persistence/PersistenceSequencial.java b/...sistence/PersistenceSequencialClient.java → ...ra/persistence/PersistenceSequencial.java
@@ -25,9 +25,9 @@
  * @author otavio
  *
  */
-public class PersistenceSequencialClient extends Persistence{
+public class PersistenceSequencial extends Persistence{
 
-	PersistenceSequencialClient(List<Client> clients, AtomicReference<ColumnFamilyIds> superColumnsRef,
+	PersistenceSequencial(List<Client> clients, AtomicReference<ColumnFamilyIds> superColumnsRef,
 			String keySpace) {
 		super(superColumnsRef, keySpace);
 		this.clients=clients;
@@ -43,7 +43,7 @@ public class PersistenceSequencialClient extends Persistence{
 	 * value for count the acess
 	 */
 	private int counter;
-	@Override
+	 @Override
 	public Client getClient() {
 		counter++;
 		if(counter==clients.size()){
@@ -56,6 +56,7 @@ public Client getClient() {
 	 * Return the number of connections in this client
 	 * @return number of connection
 	 */
+    @Override
 	public int size(){
 
 		return clients.size();

diff --git a/.../persistence/PersistenceSingleClient.java → ...sandra/persistence/PersistenceSingle.java b/.../persistence/PersistenceSingleClient.java → ...sandra/persistence/PersistenceSingle.java
@@ -10,8 +10,8 @@
  * @author otavio
  *
  */
-public class PersistenceSingleClient extends Persistence {
-	 PersistenceSingleClient(Client client,	AtomicReference<ColumnFamilyIds> superColumnsRef, String keyStore) {
+public class PersistenceSingle extends Persistence {
+	 PersistenceSingle(Client client,	AtomicReference<ColumnFamilyIds> superColumnsRef, String keyStore) {
 		super(superColumnsRef, keyStore);
 		this.client=client;
 	 }
@@ -26,6 +26,11 @@ public  Client getClient() {
         return client;
     }
 
+    @Override
+    public int size() {
+        return 1;
+    }
+
 
 
 }
diff --git a/src/test/java/org/easycassandra/persistence/EasyCassandraManagerTest.java b/src/test/java/org/easycassandra/persistence/EasyCassandraManagerTest.java
@@ -55,7 +55,7 @@ public void getPersistenceRandomNumberTest(){
     @Test
     public void getPersistenceRandomInstanceTest(){
     	EasyCassandraManager.getPersistence("javabahia", "localhost", 9160);
-    	Assert.assertTrue(EasyCassandraManager.getPersistenceRandom("javabahia") instanceof PersistenceRandomClient);
+    	Assert.assertTrue(EasyCassandraManager.getPersistenceRandom("javabahia") instanceof PersistenceRandom);
     }
 
     @Test
@@ -71,7 +71,7 @@ public void getPersistenceSequencialNumberTest(){
     @Test
     public void getPersistenceSequencialInstanceTest(){
     	EasyCassandraManager.getPersistence("javabahia", "localhost", 9160);
-    	Assert.assertTrue(EasyCassandraManager.getPersistenceSequencial("javabahia") instanceof PersistenceSequencialClient);
+    	Assert.assertTrue(EasyCassandraManager.getPersistenceSequencial("javabahia") instanceof PersistenceSequencial);
     }
 
 

diff --git a/...sistence/PersistenceRandomClientTest.java → ...ra/persistence/PersistenceRandomTest.java b/...sistence/PersistenceRandomClientTest.java → ...ra/persistence/PersistenceRandomTest.java
@@ -5,15 +5,15 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class PersistenceRandomClientTest {
+public class PersistenceRandomTest {
 
 	@Test
 	public void sizeTest(){
     	EasyCassandraManager.closeClients();
     	EasyCassandraManager.getPersistence("javabahia", "localhost", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node2", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node3", 9160);
-    	PersistenceRandomClient persistence=(PersistenceRandomClient)EasyCassandraManager.getPersistenceRandom("javabahia");
+    	Persistence persistence=EasyCassandraManager.getPersistenceRandom("javabahia");
 
     	Assert.assertTrue(persistence.size()==3);
     }
@@ -26,7 +26,7 @@ public void sizeTwoTest(){
     	EasyCassandraManager.getPersistence("javabahia", "localhost", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node2", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node3", 9160);
-    	PersistenceRandomClient persistence=(PersistenceRandomClient)EasyCassandraManager.getPersistenceRandom("javabahia");
+    	PersistenceRandom persistence=(PersistenceRandom)EasyCassandraManager.getPersistenceRandom("javabahia");
 
     	Assert.assertTrue(persistence.size()==3);
     }

diff --git a/...ence/PersistenceSequencialClientTest.java → ...ersistence/PersistenceSequencialTest.java b/...ence/PersistenceSequencialClientTest.java → ...ersistence/PersistenceSequencialTest.java
@@ -5,15 +5,15 @@
 import org.junit.Assert;
 import org.junit.Test;
 
-public class PersistenceSequencialClientTest {
+public class PersistenceSequencialTest {
 
 	@Test
 	public void sizeTest(){
     	EasyCassandraManager.closeClients();
     	EasyCassandraManager.getPersistence("javabahia", "localhost", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node2", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node3", 9160);
-    	PersistenceSequencialClient persistence=(PersistenceSequencialClient)EasyCassandraManager.getPersistenceSequencial("javabahia");
+    	Persistence persistence=EasyCassandraManager.getPersistenceSequencial("javabahia");
     	Assert.assertTrue(persistence.size()==3);
     }
 
@@ -27,7 +27,7 @@ public void sizeTowTest(){
     	EasyCassandraManager.getPersistence("javabahia", "localhost", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node2", 9160);
     	EasyCassandraManager.getPersistence("javabahia", "node3", 9160);
-    	PersistenceSequencialClient persistence=(PersistenceSequencialClient)EasyCassandraManager.getPersistenceSequencial("javabahia");
+    	PersistenceSequencial persistence=(PersistenceSequencial)EasyCassandraManager.getPersistenceSequencial("javabahia");
     	Assert.assertTrue(persistence.size()==3);
     }
 	@Test