refactoring: move api to use record

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · May 2, 2023 · f7b7d9c · f7b7d9c
1 parent 2e9e6e0
commit f7b7d9c
Show file tree

Hide file tree

Showing 24 changed files with 297 additions and 718 deletions.
diff --git a/...ation-column/src/main/java/org/eclipse/jnosql/communication/column/InsertQueryParser.java b/...ation-column/src/main/java/org/eclipse/jnosql/communication/column/InsertQueryParser.java
@@ -77,22 +77,17 @@ private ColumnEntity getEntity(InsertQuery insertQuery, String columnFamily, Par
     }
 
 
-    private static final class InsertQueryConditionSupplier implements ConditionQuerySupplier {
-        private final InsertQuery query;
-
-        private InsertQueryConditionSupplier(InsertQuery query) {
-            this.query = query;
-        }
-
-        @Override
-        public List<QueryCondition> conditions() {
-            return query.conditions();
-        }
+    private record InsertQueryConditionSupplier(InsertQuery query) implements ConditionQuerySupplier {
 
         @Override
-        public Optional<JSONQueryValue> value() {
-            return query.value();
+            public List<QueryCondition> conditions() {
+                return query.conditions();
+            }
+
+            @Override
+            public Optional<JSONQueryValue> value() {
+                return query.value();
+            }
         }
-    }
 
 }
diff --git a/...ation-column/src/main/java/org/eclipse/jnosql/communication/column/UpdateQueryParser.java b/...ation-column/src/main/java/org/eclipse/jnosql/communication/column/UpdateQueryParser.java
@@ -67,23 +67,18 @@ private ColumnEntity getEntity(Params params, UpdateQuery updateQuery, ColumnObs
         return getEntity(new UpdateQueryConditionSupplier(updateQuery), columnFamily, params, observer);
     }
 
-    private static final class UpdateQueryConditionSupplier implements ConditionQuerySupplier {
-        private final UpdateQuery query;
+    private record UpdateQueryConditionSupplier(UpdateQuery query) implements ConditionQuerySupplier {
 
-        private UpdateQueryConditionSupplier(UpdateQuery query) {
-            this.query = query;
-        }
-
-
-        @Override
-        public List<QueryCondition> conditions() {
-            return query.conditions();
-        }
 
         @Override
-        public Optional<JSONQueryValue> value() {
-            return query.value();
+            public List<QueryCondition> conditions() {
+                return query.conditions();
+            }
+
+            @Override
+            public Optional<JSONQueryValue> value() {
+                return query.value();
+            }
         }
-    }
 
 }
diff --git a/...n-document/src/main/java/org/eclipse/jnosql/communication/document/InsertQueryParser.java b/...n-document/src/main/java/org/eclipse/jnosql/communication/document/InsertQueryParser.java
@@ -74,21 +74,16 @@ private DocumentEntity getEntity(InsertQuery insertQuery, String collection, Par
     }
 
 
-    private static final class InsertQueryConditionSupplier implements ConditionQuerySupplier {
-        private final InsertQuery query;
-
-        private InsertQueryConditionSupplier(InsertQuery query) {
-            this.query = query;
-        }
-
-        @Override
-        public List<QueryCondition> conditions() {
-            return query.conditions();
-        }
+    private record InsertQueryConditionSupplier(InsertQuery query) implements ConditionQuerySupplier {
 
         @Override
-        public Optional<JSONQueryValue> value() {
-            return query.value();
+            public List<QueryCondition> conditions() {
+                return query.conditions();
+            }
+
+            @Override
+            public Optional<JSONQueryValue> value() {
+                return query.value();
+            }
         }
-    }
 }
diff --git a/...n-document/src/main/java/org/eclipse/jnosql/communication/document/UpdateQueryParser.java b/...n-document/src/main/java/org/eclipse/jnosql/communication/document/UpdateQueryParser.java
@@ -32,7 +32,7 @@ final class UpdateQueryParser extends ConditionQueryParser {
 
     Stream<DocumentEntity> query(String query, DocumentManager collectionManager, DocumentObserverParser observer) {
 
-        UpdateQueryConverter converter= new UpdateQueryConverter();
+        UpdateQueryConverter converter = new UpdateQueryConverter();
         UpdateQuery updateQuery = converter.apply(query);
 
         Params params = Params.newParams();
@@ -50,7 +50,7 @@ DocumentPreparedStatement prepare(String query, DocumentManager collectionManage
 
         Params params = Params.newParams();
 
-        UpdateQueryConverter converter= new UpdateQueryConverter();
+        UpdateQueryConverter converter = new UpdateQueryConverter();
         UpdateQuery updateQuery = converter.apply(query);
 
         DocumentEntity entity = getEntity(params, updateQuery, observer);
@@ -62,12 +62,7 @@ private DocumentEntity getEntity(Params params, UpdateQuery updateQuery, Documen
         return getEntity(new UpdateQueryConditioinSupplier(updateQuery), collection, params, observer);
     }
 
-    private static final class UpdateQueryConditioinSupplier implements ConditionQuerySupplier {
-        private final UpdateQuery query;
-
-        private UpdateQueryConditioinSupplier(UpdateQuery query) {
-            this.query = query;
-        }
+    private record UpdateQueryConditioinSupplier(UpdateQuery query) implements ConditionQuerySupplier {
 
         @Override
         public List<QueryCondition> conditions() {

diff --git a/...sql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnManagerMock.java b/...sql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/ColumnManagerMock.java
@@ -29,25 +29,16 @@ public MockFamilyManager apply(Settings settings) {
         return new MockFamilyManager(settings);
     }
 
-    public static class MockFamilyManager implements ColumnManagerFactory {
-        private final Settings settings;
-
-        public MockFamilyManager(Settings settings) {
-            this.settings = settings;
-        }
+    public record MockFamilyManager(Settings settings) implements ColumnManagerFactory {
 
         @Override
-        public ColumnManager apply(String database) {
-            return Mockito.mock(ColumnManager.class);
-        }
+            public ColumnManager apply(String database) {
+                return Mockito.mock(ColumnManager.class);
+            }
 
-        public Settings getSettings() {
-            return settings;
-        }
-
-        @Override
-        public void close() {
+            @Override
+            public void close() {
 
+            }
         }
-    }
 }
diff --git a/...rc/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock.java b/...rc/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock.java
@@ -34,17 +34,7 @@ public ColumnManagerFactoryMock apply(Settings settings) {
     }
 
 
-    public static class ColumnManagerFactoryMock implements ColumnManagerFactory {
-
-        private final Settings settings;
-
-        public Settings getSettings() {
-            return settings;
-        }
-
-        public ColumnManagerFactoryMock(Settings settings) {
-            this.settings = settings;
-        }
+    public record ColumnManagerFactoryMock(Settings settings) implements ColumnManagerFactory {
 
         @Override
         public ColumnManagerMock apply(String database) {
@@ -57,22 +47,7 @@ public void close() {
         }
     }
 
-    public static class ColumnManagerMock implements ColumnManager {
-
-        private final String database;
-
-        public ColumnManagerMock(String database) {
-            this.database = database;
-        }
-
-        public String getDatabase() {
-            return database;
-        }
-
-        @Override
-        public String name() {
-            return database;
-        }
+    public record ColumnManagerMock(String name) implements ColumnManager {
 
         @Override
         public ColumnEntity insert(ColumnEntity entity) {

diff --git a/...c/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock2.java b/...c/test/java/org/eclipse/jnosql/mapping/column/configuration/ColumnConfigurationMock2.java
@@ -34,94 +34,69 @@ public ColumnManagerFactoryMock apply(Settings settings) {
     }
 
 
-    public static class ColumnManagerFactoryMock implements ColumnManagerFactory {
-
-        private final Settings settings;
-
-        public Settings getSettings() {
-            return settings;
-        }
-
-        public ColumnManagerFactoryMock(Settings settings) {
-            this.settings = settings;
-        }
+    public record ColumnManagerFactoryMock(Settings settings) implements ColumnManagerFactory {
 
         @Override
-        public ColumnManagerMock apply(String database) {
-            return new ColumnManagerMock(database);
-        }
-
-        @Override
-        public void close() {
-
-        }
-    }
-
-    public static class ColumnManagerMock implements ColumnManager {
+            public ColumnManagerMock apply(String database) {
+                return new ColumnManagerMock(database);
+            }
 
-        private final String database;
+            @Override
+            public void close() {
 
-        public ColumnManagerMock(String database) {
-            this.database = database;
+            }
         }
 
-        public String getDatabase() {
-            return database;
-        }
+    public record ColumnManagerMock(String name) implements ColumnManager {
 
-        @Override
-        public String name() {
-            return database;
-        }
-
-        @Override
-        public ColumnEntity insert(ColumnEntity entity) {
-            return null;
-        }
+            @Override
+            public ColumnEntity insert(ColumnEntity entity) {
+                return null;
+            }
 
-        @Override
-        public ColumnEntity update(ColumnEntity entity) {
-            return null;
-        }
+            @Override
+            public ColumnEntity update(ColumnEntity entity) {
+                return null;
+            }
 
-        @Override
-        public Iterable<ColumnEntity> update(Iterable<ColumnEntity> entities) {
-            return null;
-        }
+            @Override
+            public Iterable<ColumnEntity> update(Iterable<ColumnEntity> entities) {
+                return null;
+            }
 
-        @Override
-        public ColumnEntity insert(ColumnEntity entity, Duration ttl) {
-            return null;
-        }
+            @Override
+            public ColumnEntity insert(ColumnEntity entity, Duration ttl) {
+                return null;
+            }
 
-        @Override
-        public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities) {
-            return null;
-        }
+            @Override
+            public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities) {
+                return null;
+            }
 
-        @Override
-        public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities, Duration ttl) {
-            return null;
-        }
+            @Override
+            public Iterable<ColumnEntity> insert(Iterable<ColumnEntity> entities, Duration ttl) {
+                return null;
+            }
 
-        @Override
-        public void delete(ColumnDeleteQuery query) {
+            @Override
+            public void delete(ColumnDeleteQuery query) {
 
-        }
+            }
 
-        @Override
-        public Stream<ColumnEntity> select(ColumnQuery query) {
-            return null;
-        }
+            @Override
+            public Stream<ColumnEntity> select(ColumnQuery query) {
+                return null;
+            }
 
-        @Override
-        public long count(String columnFamily) {
-            return 0;
-        }
+            @Override
+            public long count(String columnFamily) {
+                return 0;
+            }
 
-        @Override
-        public void close() {
+            @Override
+            public void close() {
 
+            }
         }
-    }
 }
diff --git a/...jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/entities/Money.java b/...jnosql-mapping-column/src/test/java/org/eclipse/jnosql/mapping/column/entities/Money.java
@@ -18,42 +18,7 @@
 import java.math.BigDecimal;
 import java.util.Objects;
 
-public class Money {
-
-    private final String currency;
-
-    private final BigDecimal value;
-
-    public Money(String currency, BigDecimal value) {
-        this.currency = currency;
-        this.value = value;
-    }
-
-    public String getCurrency() {
-        return currency;
-    }
-
-    public BigDecimal getValue() {
-        return value;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-        Money money = (Money) o;
-        return Objects.equals(currency, money.currency) &&
-                Objects.equals(value.doubleValue(), money.value.doubleValue());
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(currency, value.doubleValue());
-    }
+public record Money(String currency, BigDecimal value) {
 
     @Override
     public String toString() {