feat: update hbase api

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · Mar 3, 2024 · ef8dbfc · ef8dbfc
1 parent 8f4bf15
commit ef8dbfc
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 94 deletions.
diff --git a/...rc/main/java/org/eclipse/jnosql/databases/couchdb/communication/CouchDBDocumentQuery.java b/...rc/main/java/org/eclipse/jnosql/databases/couchdb/communication/CouchDBDocumentQuery.java
@@ -118,7 +118,7 @@ public String toString() {
     /**
      * returns a new instance of {@link CouchDBDocumentQuery}
      *
-     * @param query the {@link DocumentQuery}
+     * @param query the {@link SelectQuery}
      * @return a new instance
      * @throws NullPointerException when query is null
      */
@@ -130,7 +130,7 @@ public static CouchDBDocumentQuery of(SelectQuery query) {
     /**
      * returns a new instance of {@link CouchDBDocumentQuery}
      *
-     * @param query    the {@link DocumentQuery}
+     * @param query    the {@link SelectQuery}
      * @param bookmark {@link CouchDBDocumentQuery#bookmark}
      * @return a new instance
      * @throws NullPointerException when there is null parameter

diff --git a/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/EntityUnit.java b/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/EntityUnit.java
@@ -17,8 +17,8 @@
 
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.client.Result;
-import org.eclipse.jnosql.communication.column.Column;
-import org.eclipse.jnosql.communication.column.ColumnEntity;
+import org.eclipse.jnosql.communication.semistructured.CommunicationEntity;
+import org.eclipse.jnosql.communication.semistructured.Element;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +34,7 @@ class EntityUnit {
 
     private String columnFamily;
 
-    private final List<Column> columns = new ArrayList<>();
+    private final List<Element> columns = new ArrayList<>();
 
     EntityUnit(Result result) {
 
@@ -48,7 +48,7 @@ class EntityUnit {
             if (this.columnFamily == null) {
                 this.columnFamily = new String(cloneFamily(cell));
             }
-            columns.add(Column.of(name, value));
+            columns.add(Element.of(name, value));
         }
     }
 
@@ -57,20 +57,19 @@ public boolean isNotEmpty() {
         return !columns.isEmpty();
     }
 
-    public ColumnEntity toEntity() {
-        ColumnEntity entity = ColumnEntity.of(columnFamily);
+    public CommunicationEntity toEntity() {
+        var entity = CommunicationEntity.of(columnFamily);
         entity.addAll(columns);
         entity.add(HBaseUtils.getKey(rowKey));
         return entity;
     }
 
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder("EntityUnit{");
-        sb.append("rowKey='").append(rowKey).append('\'');
-        sb.append(", columnFamily='").append(columnFamily).append('\'');
-        sb.append(", columns=").append(columns);
-        sb.append('}');
-        return sb.toString();
+        return "EntityUnit{" +
+                "rowKey='" + rowKey + '\'' +
+                ", columnFamily='" + columnFamily + '\'' +
+                ", columns=" + columns +
+                '}';
     }
 }
diff --git a/.../main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnConfiguration.java b/.../main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnConfiguration.java
@@ -18,7 +18,7 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.eclipse.jnosql.communication.Settings;
-import org.eclipse.jnosql.communication.column.ColumnConfiguration;
+import org.eclipse.jnosql.communication.semistructured.DatabaseConfiguration;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +31,7 @@
  * Configuration to HBase that returns {@link HBaseColumnManagerFactory}
  * <p>hbase.family.n: as prefix to add family, eg: hbase,family.1=column-family</p>
  */
-public class HBaseColumnConfiguration implements ColumnConfiguration {
+public class HBaseColumnConfiguration implements DatabaseConfiguration {
 
     private final Configuration configuration;
 

diff --git a/...se/src/main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManager.java b/...se/src/main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManager.java
@@ -27,12 +27,12 @@
 import org.eclipse.jnosql.communication.Value;
 import org.eclipse.jnosql.communication.ValueWriter;
 import org.eclipse.jnosql.communication.ValueWriterDecorator;
-import org.eclipse.jnosql.communication.column.Column;
-import org.eclipse.jnosql.communication.column.ColumnCondition;
-import org.eclipse.jnosql.communication.column.ColumnDeleteQuery;
-import org.eclipse.jnosql.communication.column.ColumnEntity;
-import org.eclipse.jnosql.communication.column.ColumnManager;
-import org.eclipse.jnosql.communication.column.ColumnQuery;
+import org.eclipse.jnosql.communication.semistructured.CommunicationEntity;
+import org.eclipse.jnosql.communication.semistructured.CriteriaCondition;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManager;
+import org.eclipse.jnosql.communication.semistructured.DeleteQuery;
+import org.eclipse.jnosql.communication.semistructured.Element;
+import org.eclipse.jnosql.communication.semistructured.SelectQuery;
 
 import java.io.IOException;
 import java.time.Duration;
@@ -50,11 +50,11 @@
 import static org.eclipse.jnosql.communication.Condition.OR;
 
 /**
- * The Hbase implementation to {@link ColumnManager}.
+ * The Hbase implementation to {@link DatabaseManager}.
  * It does not support TTL methods
- * <p>{@link HBaseColumnManager#insert(ColumnEntity, Duration)}</p>
+ * <p>{@link HBaseColumnManager#insert(org.eclipse.jnosql.communication.semistructured.CommunicationEntity, Duration)}</p>
  */
-public class HBaseColumnManager implements ColumnManager {
+public class HBaseColumnManager implements DatabaseManager {
 
     private static final String KEY_REQUIRED_ERROR = "\"To save an entity is necessary to have an row, a Column that has a blank name. Documents.of(\\\"\\\", keyValue);\"";
 
@@ -77,14 +77,14 @@ public String name() {
     }
 
     @Override
-    public ColumnEntity insert(ColumnEntity entity) {
+    public CommunicationEntity insert(CommunicationEntity entity) {
         Objects.requireNonNull(entity, "entity is required");
         String family = entity.name();
-        List<Column> columns = entity.columns();
+        List<Element> columns = entity.elements();
         if (columns.isEmpty()) {
             return entity;
         }
-        Column columnID = entity.find(HBaseUtils.KEY_COLUMN).orElseThrow(() -> new HBaseException(KEY_REQUIRED_ERROR));
+        Element columnID = entity.find(HBaseUtils.KEY_COLUMN).orElseThrow(() -> new HBaseException(KEY_REQUIRED_ERROR));
 
         Put put = new Put(Bytes.toBytes(valueToString(columnID.value())));
         columns.stream().filter(Predicate.isEqual(columnID).negate()).forEach(column ->
@@ -100,33 +100,33 @@ public ColumnEntity insert(ColumnEntity entity) {
     }
 
     @Override
-    public ColumnEntity update(ColumnEntity entity) throws NullPointerException {
+    public CommunicationEntity update(CommunicationEntity entity) throws NullPointerException {
         return insert(entity);
     }
 
     @Override
-    public Iterable<ColumnEntity> update(Iterable<ColumnEntity> entities) {
+    public Iterable<CommunicationEntity> update(Iterable<CommunicationEntity> entities) {
         Objects.requireNonNull(entities, "entities is required");
         return StreamSupport.stream(entities.spliterator(), false)
                 .map(this::update)
                 .collect(Collectors.toList());
     }
 
     @Override
-    public ColumnEntity insert(ColumnEntity entity, Duration ttl) throws NullPointerException {
+    public CommunicationEntity insert(CommunicationEntity entity, Duration ttl) throws NullPointerException {
         throw new UnsupportedOperationException("There is not support to save async");
     }
 
     @Override
-    public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities) {
+    public Iterable<CommunicationEntity> insert(Iterable<CommunicationEntity> entities) {
         Objects.requireNonNull(entities, "entities is required");
         return StreamSupport.stream(entities.spliterator(), false)
                 .map(this::insert)
                 .collect(Collectors.toList());
     }
 
     @Override
-    public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities, Duration ttl) {
+    public Iterable<CommunicationEntity> insert(Iterable<CommunicationEntity> entities, Duration ttl) {
         Objects.requireNonNull(entities, "entities is required");
         Objects.requireNonNull(ttl, "ttl is required");
         return StreamSupport.stream(entities.spliterator(), false)
@@ -136,9 +136,9 @@ public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities, Duration t
 
 
     @Override
-    public void delete(ColumnDeleteQuery query) {
+    public void delete(DeleteQuery query) {
         Objects.requireNonNull(query, "query is required");
-        ColumnCondition condition = query.condition()
+        CriteriaCondition condition = query.condition()
                 .orElseThrow(() -> new IllegalArgumentException("Condition is required"));
         checkedCondition(condition);
         List<String> values = new ArrayList<>();
@@ -159,9 +159,9 @@ public void delete(ColumnDeleteQuery query) {
 
 
     @Override
-    public Stream<ColumnEntity> select(ColumnQuery query) {
+    public Stream<CommunicationEntity> select(SelectQuery query) {
         Objects.requireNonNull(query, "query is required");
-        ColumnCondition condition = query.condition()
+        var condition = query.condition()
                 .orElseThrow(() -> new IllegalArgumentException("Condition is required"));
         checkedCondition(condition);
         return Stream.of(findById(condition))
@@ -194,7 +194,7 @@ private String valueToString(Value value) {
         }
     }
 
-    private Result[] findById(ColumnCondition condition) {
+    private Result[] findById(CriteriaCondition condition) {
         List<String> values = new ArrayList<>();
         convert(condition, values);
 
@@ -209,29 +209,29 @@ private Result[] findById(ColumnCondition condition) {
     }
 
 
-    private void convert(ColumnCondition columnCondition, List<String> values) {
+    private void convert(CriteriaCondition columnCondition, List<String> values) {
         Condition condition = columnCondition.condition();
 
         if (OR.equals(condition)) {
-            columnCondition.column().get(new TypeReference<List<ColumnCondition>>() {
+            columnCondition.element().get(new TypeReference<List<CriteriaCondition>>() {
             }).forEach(c -> convert(c, values));
         } else if (IN.equals(condition)) {
-            values.addAll(columnCondition.column().get(new TypeReference<List<String>>() {
+            values.addAll(columnCondition.element().get(new TypeReference<List<String>>() {
             }));
         } else if (EQUALS.equals(condition)) {
-            values.add(valueToString(columnCondition.column().value()));
+            values.add(valueToString(columnCondition.element().value()));
         }
 
 
     }
 
-    private void checkedCondition(ColumnCondition columnCondition) {
+    private void checkedCondition(CriteriaCondition columnCondition) {
 
         Condition condition = columnCondition.condition();
         if (OR.equals(condition)) {
-            List<ColumnCondition> columnConditions = columnCondition.column().get(new TypeReference<>() {
+            List<CriteriaCondition> columnConditions = columnCondition.element().get(new TypeReference<>() {
             });
-            for (ColumnCondition cc : columnConditions) {
+            for (CriteriaCondition cc : columnConditions) {
                 checkedCondition(cc);
             }
             return;

diff --git a/...main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManagerFactory.java b/...main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManagerFactory.java
@@ -25,14 +25,14 @@
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.client.TableDescriptor;
 import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
-import org.eclipse.jnosql.communication.column.ColumnManagerFactory;
+import org.eclipse.jnosql.communication.semistructured.DatabaseManagerFactory;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class HBaseColumnManagerFactory implements ColumnManagerFactory {
+public class HBaseColumnManagerFactory implements DatabaseManagerFactory {
 
     private final Configuration configuration;
 

diff --git a/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseUtils.java b/jnosql-hbase/src/main/java/org/eclipse/jnosql/databases/hbase/communication/HBaseUtils.java
@@ -15,7 +15,7 @@
 package org.eclipse.jnosql.databases.hbase.communication;
 
 
-import org.eclipse.jnosql.communication.column.Column;
+import org.eclipse.jnosql.communication.semistructured.Element;
 
 final class HBaseUtils {
 
@@ -25,8 +25,8 @@ private HBaseUtils() {
     }
 
 
-    static Column getKey(Object value) {
-        return Column.of(KEY_COLUMN, value);
+    static Element getKey(Object value) {
+        return Element.of(KEY_COLUMN, value);
     }
 
 

diff --git a/....communication.column.ColumnConfiguration → ...tion.semistructured.DatabaseConfiguration b/....communication.column.ColumnConfiguration → ...tion.semistructured.DatabaseConfiguration
diff --git a/...t/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnConfigurationTest.java b/...t/java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnConfigurationTest.java
@@ -31,13 +31,13 @@ public class HBaseColumnConfigurationTest {
 
     @Test
     public void shouldCreatesColumnManagerFactory() {
-        ColumnConfiguration configuration = new HBaseColumnConfiguration();
+        var configuration = new HBaseColumnConfiguration();
         assertNotNull(configuration.apply(Settings.builder().build()));
     }
 
     @Test
     public void shouldCreatesColumnManagerFactoryFromConfiguration() {
-        ColumnConfiguration configuration = new HBaseColumnConfiguration();
+        var configuration = new HBaseColumnConfiguration();
         assertNotNull(configuration.apply(Settings.builder().build()));
     }
 

diff --git a/.../java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManagerFactoryTest.java b/.../java/org/eclipse/jnosql/databases/hbase/communication/HBaseColumnManagerFactoryTest.java
@@ -16,8 +16,7 @@
 package org.eclipse.jnosql.databases.hbase.communication;
 
 import org.eclipse.jnosql.communication.Settings;
-import org.eclipse.jnosql.communication.column.ColumnConfiguration;
-import org.eclipse.jnosql.communication.column.ColumnManagerFactory;
+import org.eclipse.jnosql.communication.semistructured.DatabaseConfiguration;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
@@ -28,11 +27,11 @@
 
 @EnabledIfSystemProperty(named = NAMED, matches = MATCHES)
 public class HBaseColumnManagerFactoryTest {
-    private ColumnConfiguration configuration = new HBaseColumnConfiguration();
+    private DatabaseConfiguration configuration = new HBaseColumnConfiguration();
 
     @Test
     public void shouldCreateColumnManager() {
-        ColumnManagerFactory managerFactory = configuration.apply(Settings.builder().build());
+        var managerFactory = configuration.apply(Settings.builder().build());
         assertNotNull(managerFactory);
     }