remove column family syntax

otaviojava · otaviojava · commit d2ebaa168148 · 2022-11-25T17:19:56.000Z
Signed-off-by: Otavio Santana &lt;otaviopolianasantana@gmail.com&gt;
diff --git a/jnosql-cassandra-driver/src/main/java/org/eclipse/jnosql/communication/cassandra/column/DefaultCassandraColumnManager.java b/jnosql-cassandra-driver/src/main/java/org/eclipse/jnosql/communication/cassandra/column/DefaultCassandraColumnManager.java
@@ -230,10 +230,10 @@ CqlSession getSession() {
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("CassandraColumnFamilyManager{");
-        sb.append("session=").append(session);
-        sb.append('}');
-        return sb.toString();
+        return "DefaultCassandraColumnManager{" +
+                "session=" + session +
+                ", keyspace='" + keyspace + '\'' +
+                '}';
     }
 }
 
diff --git a/jnosql-cassandra-driver/src/test/java/org/eclipse/jnosql/communication/cassandra/column/CassandraColumnManagerTest.java b/jnosql-cassandra-driver/src/test/java/org/eclipse/jnosql/communication/cassandra/column/CassandraColumnManagerTest.java
@@ -69,8 +69,8 @@ public class CassandraColumnManagerTest {
 
     @AfterEach
     public void afterEach() {
-        DefaultCassandraColumnManager cassandraColumnFamilyManager = DefaultCassandraColumnManager.class.cast(entityManager);
-        CqlSession session = cassandraColumnFamilyManager.getSession();
+        DefaultCassandraColumnManager manager = DefaultCassandraColumnManager.class.cast(entityManager);
+        CqlSession session = manager.getSession();
         if (!session.isClosed()) {
             entityManager.cql("TRUNCATE " + Constants.KEY_SPACE + '.' + Constants.COLUMN_FAMILY);
             entityManager.cql("TRUNCATE " + Constants.KEY_SPACE + '.' + "users");
@@ -80,8 +80,8 @@ public void afterEach() {
     @Test
     public void shouldClose() throws Exception {
         entityManager.close();
-        DefaultCassandraColumnManager cassandraColumnFamilyManager = DefaultCassandraColumnManager.class.cast(entityManager);
-        CqlSession session = cassandraColumnFamilyManager.getSession();
+        DefaultCassandraColumnManager manager = DefaultCassandraColumnManager.class.cast(entityManager);
+        CqlSession session = manager.getSession();
         assertTrue(session.isClosed());
     }
 
diff --git a/jnosql-hbase-driver/src/main/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnManager.java b/jnosql-hbase-driver/src/main/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnManager.java
@@ -242,13 +242,12 @@ private void checkedCondition(ColumnCondition columnCondition) {
         }
     }
 
+
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("HBaseColumnFamilyManager{");
-        sb.append("connection=").append(connection);
-        sb.append('}');
-        return sb.toString();
+        return "HBaseColumnManager{" +
+                "table=" + table +
+                ", database='" + database + '\'' +
+                '}';
     }
-
-
 }
diff --git a/jnosql-hbase-driver/src/main/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnManagerFactory.java b/jnosql-hbase-driver/src/main/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnManagerFactory.java
@@ -57,7 +57,7 @@ public HBaseColumnManager apply(String database) {
             Table table = connection.getTable(tableName);
             return new HBaseColumnManager(connection, table, database);
         } catch (IOException e) {
-            throw new HBaseException("A error happened when try to create ColumnFamilyManager", e);
+            throw new HBaseException("A error happened when try to create ColumnManager", e);
         }
     }
 
diff --git a/jnosql-hbase-driver/src/test/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnConfigurationTest.java b/jnosql-hbase-driver/src/test/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnConfigurationTest.java
@@ -26,19 +26,19 @@ public class HBaseColumnConfigurationTest {
 
 
     @Test
-    public void shouldCreatesColumnFamilyManagerFactory() {
+    public void shouldCreatesColumnManagerFactory() {
         ColumnConfiguration configuration = new HBaseColumnConfiguration();
         assertNotNull(configuration.apply(Settings.builder().build()));
     }
 
     @Test
-    public void shouldCreatesColumnFamilyManagerFactoryFromConfiguration() {
+    public void shouldCreatesColumnManagerFactoryFromConfiguration() {
         ColumnConfiguration configuration = new HBaseColumnConfiguration();
         assertNotNull(configuration.apply(Settings.builder().build()));
     }
 
     @Test
-    public void shouldReturnErrorCreatesColumnFamilyManagerFactory() {
+    public void shouldReturnErrorCreatesColumnManagerFactory() {
         assertThrows(NullPointerException.class, () -> new HBaseColumnConfiguration(null));
     }
 }
diff --git a/jnosql-hbase-driver/src/test/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnManagerFactoryTest.java b/jnosql-hbase-driver/src/test/java/org/eclipse/jnosql/communication/hbase/column/HBaseColumnManagerFactoryTest.java
@@ -27,7 +27,7 @@ public class HBaseColumnManagerFactoryTest {
     private ColumnConfiguration configuration = new HBaseColumnConfiguration();
 
     @Test
-    public void shouldCreateColumnFamilyManager() {
+    public void shouldCreateColumnManager() {
         ColumnManagerFactory managerFactory = configuration.apply(Settings.builder().build());
         assertNotNull(managerFactory);
     }
diff --git a/jnosql-hbase-driver/src/test/java/org/eclipse/jnosql/communication/hbase/column/HBaseFamilyManagerTest.java b/jnosql-hbase-driver/src/test/java/org/eclipse/jnosql/communication/hbase/column/HBaseFamilyManagerTest.java
@@ -45,21 +45,21 @@ public class HBaseFamilyManagerTest {
 
     private ColumnManagerFactory managerFactory;
 
-    private ColumnManager columnFamilyManager;
+    private ColumnManager manager;
 
     @BeforeEach
     public void setUp() {
         HBaseColumnConfiguration configuration = new HBaseColumnConfiguration();
         configuration.add(FAMILY);
         managerFactory = configuration.apply(Settings.builder().build());
-        columnFamilyManager = managerFactory.apply(DATA_BASE);
+        manager = managerFactory.apply(DATA_BASE);
     }
 
 
     @Test
     public void shouldSave() {
         ColumnEntity entity = createEntity();
-        columnFamilyManager.insert(entity);
+        manager.insert(entity);
     }
 
     @Test
@@ -68,15 +68,15 @@ public void shouldReturnErrorWhenKeyIsNotDefined() {
         entity.add(Column.of("id", "otaviojava"));
         entity.add(Column.of("age", 26));
         entity.add(Column.of("country", "Brazil"));
-        assertThrows(HBaseException.class, () -> columnFamilyManager.insert(entity));
+        assertThrows(HBaseException.class, () -> manager.insert(entity));
     }
 
     @Test
     public void shouldFind() {
-        columnFamilyManager.insert(createEntity());
+        manager.insert(createEntity());
 
         ColumnQuery query = select().from(FAMILY).where(ID_FIELD).eq("otaviojava").build();
-        List<ColumnEntity> columnFamilyEntities = columnFamilyManager.select(query).collect(Collectors.toList());
+        List<ColumnEntity> columnFamilyEntities = manager.select(query).collect(Collectors.toList());
         assertNotNull(columnFamilyEntities);
         assertFalse(columnFamilyEntities.isEmpty());
         ColumnEntity entity = columnFamilyEntities.get(0);
@@ -87,40 +87,40 @@ public void shouldFind() {
 
     @Test
     public void shouldFindInBatch() {
-        columnFamilyManager.insert(createEntity());
-        columnFamilyManager.insert(createEntity2());
+        manager.insert(createEntity());
+        manager.insert(createEntity2());
 
         ColumnQuery query = select().from(FAMILY).where(ID_FIELD).eq("otaviojava")
                 .or(ID_FIELD).eq("poliana").build();
 
-        List<ColumnEntity> entities = columnFamilyManager.select(query).collect(Collectors.toList());
+        List<ColumnEntity> entities = manager.select(query).collect(Collectors.toList());
         assertEquals(Integer.valueOf(2), Integer.valueOf(entities.size()));
 
     }
 
     @Test
     public void shouldDeleteEntity() {
-        columnFamilyManager.insert(createEntity());
+        manager.insert(createEntity());
         ColumnQuery query = select().from(FAMILY).where(ID_FIELD).eq("otaviojava").build();
         ColumnDeleteQuery deleteQuery = delete().from(FAMILY).where(ID_FIELD).eq("otaviojava").build();
-        columnFamilyManager.delete(deleteQuery);
-        List<ColumnEntity> entities = columnFamilyManager.select(query).collect(Collectors.toList());
+        manager.delete(deleteQuery);
+        List<ColumnEntity> entities = manager.select(query).collect(Collectors.toList());
         assertTrue(entities.isEmpty());
     }
 
     @Test
     public void shouldDeleteEntities() {
-        columnFamilyManager.insert(createEntity());
-        columnFamilyManager.insert(createEntity2());
+        manager.insert(createEntity());
+        manager.insert(createEntity2());
 
         ColumnQuery query = select().from(FAMILY).where(ID_FIELD).eq("otaviojava")
                 .or(ID_FIELD).eq("poliana").build();
 
         ColumnDeleteQuery deleteQuery = delete().from(FAMILY).where(ID_FIELD).eq("otaviojava")
                 .or(ID_FIELD).eq("poliana").build();
 
-        columnFamilyManager.delete(deleteQuery);
-        List<ColumnEntity> entities = columnFamilyManager.select(query).collect(Collectors.toList());
+        manager.delete(deleteQuery);
+        List<ColumnEntity> entities = manager.select(query).collect(Collectors.toList());
         assertTrue(entities.isEmpty());
     }
 

Original file line number	Diff line number	Diff line change
`@@ -230,10 +230,10 @@ CqlSession getSession() {`
`230`	`230`
`231`	`231`	`@Override`
`232`	`232`	`public String toString() {`
`233`		`- final StringBuilder sb = new StringBuilder("CassandraColumnFamilyManager{");`
`234`		`- sb.append("session=").append(session);`
`235`		`- sb.append('}');`
`236`		`- return sb.toString();`
	`233`	`+ return "DefaultCassandraColumnManager{" +`
	`234`	`+ "session=" + session +`
	`235`	`+ ", keyspace='" + keyspace + '\'' +`
	`236`	`+ '}';`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`
Original file line number	Diff line number	Diff line change
`@@ -242,13 +242,12 @@ private void checkedCondition(ColumnCondition columnCondition) {`
`242`	`242`	`}`
`243`	`243`	`}`
`244`	`244`
	`245`	`+`
`245`	`246`	`@Override`
`246`	`247`	`public String toString() {`
`247`		`- final StringBuilder sb = new StringBuilder("HBaseColumnFamilyManager{");`
`248`		`- sb.append("connection=").append(connection);`
`249`		`- sb.append('}');`
`250`		`- return sb.toString();`
	`248`	`+ return "HBaseColumnManager{" +`
	`249`	`+ "table=" + table +`
	`250`	`+ ", database='" + database + '\'' +`
	`251`	`+ '}';`
`251`	`252`	`}`
`252`		`-`
`253`		`-`
`254`	`253`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public HBaseColumnManager apply(String database) {`
`57`	`57`	`Table table = connection.getTable(tableName);`
`58`	`58`	`return new HBaseColumnManager(connection, table, database);`
`59`	`59`	`} catch (IOException e) {`
`60`		`- throw new HBaseException("A error happened when try to create ColumnFamilyManager", e);`
	`60`	`+ throw new HBaseException("A error happened when try to create ColumnManager", e);`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -26,19 +26,19 @@ public class HBaseColumnConfigurationTest {`
`26`	`26`
`27`	`27`
`28`	`28`	`@Test`
`29`		`- public void shouldCreatesColumnFamilyManagerFactory() {`
	`29`	`+ public void shouldCreatesColumnManagerFactory() {`
`30`	`30`	`ColumnConfiguration configuration = new HBaseColumnConfiguration();`
`31`	`31`	`assertNotNull(configuration.apply(Settings.builder().build()));`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Test`
`35`		`- public void shouldCreatesColumnFamilyManagerFactoryFromConfiguration() {`
	`35`	`+ public void shouldCreatesColumnManagerFactoryFromConfiguration() {`
`36`	`36`	`ColumnConfiguration configuration = new HBaseColumnConfiguration();`
`37`	`37`	`assertNotNull(configuration.apply(Settings.builder().build()));`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`@Test`
`41`		`- public void shouldReturnErrorCreatesColumnFamilyManagerFactory() {`
	`41`	`+ public void shouldReturnErrorCreatesColumnManagerFactory() {`
`42`	`42`	`assertThrows(NullPointerException.class, () -> new HBaseColumnConfiguration(null));`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class HBaseColumnManagerFactoryTest {`
`27`	`27`	`private ColumnConfiguration configuration = new HBaseColumnConfiguration();`
`28`	`28`
`29`	`29`	`@Test`
`30`		`- public void shouldCreateColumnFamilyManager() {`
	`30`	`+ public void shouldCreateColumnManager() {`
`31`	`31`	`ColumnManagerFactory managerFactory = configuration.apply(Settings.builder().build());`
`32`	`32`	`assertNotNull(managerFactory);`
`33`	`33`	`}`