Merge pull request #449 from eclipse/refactoring

Refactoring the current code
eclipse-jnosql · Nov 11, 2023 · 3fe0364 · 3fe0364
2 parents d5e3866 + f3a5d99
commit 3fe0364
Show file tree

Hide file tree

Showing 28 changed files with 57 additions and 89 deletions.
diff --git a/...olumn/src/main/java/org/eclipse/jnosql/communication/column/DefaultColumnDeleteQuery.java b/...olumn/src/main/java/org/eclipse/jnosql/communication/column/DefaultColumnDeleteQuery.java
@@ -62,10 +62,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof ColumnDeleteQuery)) {
+        if (!(o instanceof ColumnDeleteQuery that)) {
             return false;
         }
-        ColumnDeleteQuery that = (ColumnDeleteQuery) o;
         return Objects.equals(columnFamily, that.name()) &&
                 Objects.equals(condition, that.condition().orElse(null)) &&
                 Objects.equals(columns, that.columns());

diff --git a/...tion-column/src/main/java/org/eclipse/jnosql/communication/column/DefaultColumnQuery.java b/...tion-column/src/main/java/org/eclipse/jnosql/communication/column/DefaultColumnQuery.java
@@ -91,10 +91,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof ColumnQuery)) {
+        if (!(o instanceof ColumnQuery that)) {
             return false;
         }
-        ColumnQuery that = (ColumnQuery) o;
         return maxResults == that.limit() &&
                 firstResult == that.skip() &&
                 Objects.equals(columnFamily, that.name()) &&

diff --git a/...nosql-communication-core/src/main/java/org/eclipse/jnosql/communication/DefaultValue.java b/...nosql-communication-core/src/main/java/org/eclipse/jnosql/communication/DefaultValue.java
@@ -66,10 +66,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof Value)) {
+        if (!(o instanceof Value that)) {
             return false;
         }
-        Value that = (Value) o;
         return Objects.equals(value, that.get());
     }
 

diff --git a/.../jnosql-communication-core/src/test/java/org/eclipse/jnosql/communication/ParamsTest.java b/.../jnosql-communication-core/src/test/java/org/eclipse/jnosql/communication/ParamsTest.java
@@ -135,7 +135,7 @@ void testBind() {
     @DisplayName("given a filled Params")
     class GivenFilledParamsTest {
 
-        class Scenario {
+        static class Scenario {
 
             final Params params;
             final List<String> parameterNameList;

diff --git a/...t/src/main/java/org/eclipse/jnosql/communication/document/DefaultDocumentDeleteQuery.java b/...t/src/main/java/org/eclipse/jnosql/communication/document/DefaultDocumentDeleteQuery.java
@@ -62,10 +62,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DocumentDeleteQuery)) {
+        if (!(o instanceof DocumentDeleteQuery that)) {
             return false;
         }
-        DocumentDeleteQuery that = (DocumentDeleteQuery) o;
         return Objects.equals(documentCollection, that.name()) &&
                 Objects.equals(condition, that.condition().orElse(null)) &&
                 Objects.equals(documents, that.documents());

diff --git a/...ocument/src/main/java/org/eclipse/jnosql/communication/document/DefaultDocumentQuery.java b/...ocument/src/main/java/org/eclipse/jnosql/communication/document/DefaultDocumentQuery.java
@@ -87,10 +87,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DocumentQuery)) {
+        if (!(o instanceof DocumentQuery that)) {
             return false;
         }
-        DocumentQuery that = (DocumentQuery) o;
         return limit == that.limit() &&
                 skip == that.skip() &&
                 Objects.equals(documentCollection, that.name()) &&

diff --git a/...tion-document/src/main/java/org/eclipse/jnosql/communication/document/DocumentEntity.java b/...tion-document/src/main/java/org/eclipse/jnosql/communication/document/DocumentEntity.java
@@ -289,10 +289,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DocumentEntity)) {
+        if (!(o instanceof DocumentEntity that)) {
             return false;
         }
-        DocumentEntity that = (DocumentEntity) o;
         return Objects.equals(this.documents().stream().sorted(comparing(Document::name)).collect(toList()),
                 that.documents().stream().sorted(comparing(Document::name)).collect(toList())) &&
                 Objects.equals(name, that.name());

diff --git a/...ication-query/src/main/java/org/eclipse/jnosql/communication/query/BooleanQueryValue.java b/...ication-query/src/main/java/org/eclipse/jnosql/communication/query/BooleanQueryValue.java
@@ -65,7 +65,7 @@ public String toString() {
                 '}';
     }
 
-    public static QueryValue<?> of(QueryParser.BoolContext context) {
+    public static QueryValue<Boolean> of(QueryParser.BoolContext context) {
         String text = context.BOOLEAN().getText();
         return new BooleanQueryValue(Boolean.parseBoolean(text));
     }

diff --git a/...ation-query/src/main/java/org/eclipse/jnosql/communication/query/ConditionQueryValue.java b/...ation-query/src/main/java/org/eclipse/jnosql/communication/query/ConditionQueryValue.java
@@ -40,10 +40,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof ConditionQueryValue)) {
+        if (!(o instanceof ConditionQueryValue that)) {
             return false;
         }
-        ConditionQueryValue that = (ConditionQueryValue) o;
         return Objects.equals(conditions, that.conditions);
     }
 

diff --git a/...on-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultArrayQueryValue.java b/...on-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultArrayQueryValue.java
@@ -35,10 +35,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DefaultArrayQueryValue)) {
+        if (!(o instanceof DefaultArrayQueryValue that)) {
             return false;
         }
-        DefaultArrayQueryValue that = (DefaultArrayQueryValue) o;
         return Arrays.equals(values, that.values);
     }
 

diff --git a/...unication-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultFunction.java b/...unication-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultFunction.java
@@ -41,10 +41,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DefaultFunction)) {
+        if (!(o instanceof DefaultFunction that)) {
             return false;
         }
-        DefaultFunction that = (DefaultFunction) o;
         return Objects.equals(name, that.name) &&
                 Arrays.equals(args, that.args);
     }

diff --git a/...ication-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultQueryValue.java b/...ication-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultQueryValue.java
@@ -36,10 +36,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DefaultQueryValue)) {
+        if (!(o instanceof DefaultQueryValue that)) {
             return false;
         }
-        DefaultQueryValue that = (DefaultQueryValue) o;
         return Objects.equals(value, that.value);
     }
 

diff --git a/...cation-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultSelectQuery.java b/...cation-query/src/main/java/org/eclipse/jnosql/communication/query/DefaultSelectQuery.java
@@ -95,10 +95,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DefaultSelectQuery)) {
+        if (!(o instanceof DefaultSelectQuery that)) {
             return false;
         }
-        DefaultSelectQuery that = (DefaultSelectQuery) o;
         return skip == that.skip &&
                 limit == that.limit &&
                 Objects.equals(entity, that.entity) &&

diff --git a/...communication-query/src/main/java/org/eclipse/jnosql/communication/query/DeleteQuery.java b/...communication-query/src/main/java/org/eclipse/jnosql/communication/query/DeleteQuery.java
@@ -66,10 +66,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof DeleteQuery)) {
+        if (!(o instanceof DeleteQuery that)) {
             return false;
         }
-        DeleteQuery that = (DeleteQuery) o;
         return Objects.equals(entity, that.entity) &&
                 Objects.equals(fields, that.fields) &&
                 Objects.equals(where, that.where);

diff --git a/...cation-query/src/main/java/org/eclipse/jnosql/communication/query/FunctionQueryValue.java b/...cation-query/src/main/java/org/eclipse/jnosql/communication/query/FunctionQueryValue.java
@@ -39,10 +39,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof FunctionQueryValue)) {
+        if (!(o instanceof FunctionQueryValue that)) {
             return false;
         }
-        FunctionQueryValue that = (FunctionQueryValue) o;
         return Objects.equals(function, that.function);
     }
 

diff --git a/...ql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/GetQuery.java b/...ql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/GetQuery.java
@@ -43,10 +43,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof GetQuery)) {
+        if (!(o instanceof GetQuery that)) {
             return false;
         }
-        GetQuery that = (GetQuery) o;
         return Objects.equals(keys, that.keys);
     }
 

diff --git a/...communication-query/src/main/java/org/eclipse/jnosql/communication/query/InsertQuery.java b/...communication-query/src/main/java/org/eclipse/jnosql/communication/query/InsertQuery.java
@@ -83,10 +83,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof InsertQuery)) {
+        if (!(o instanceof InsertQuery that)) {
             return false;
         }
-        InsertQuery that = (InsertQuery) o;
         return Objects.equals(entity, that.entity) &&
                 Objects.equals(duration, that.duration) &&
                 Objects.equals(conditions, that.conditions);

diff --git a/...nication-query/src/main/java/org/eclipse/jnosql/communication/query/NumberQueryValue.java b/...nication-query/src/main/java/org/eclipse/jnosql/communication/query/NumberQueryValue.java
@@ -38,10 +38,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof NumberQueryValue)) {
+        if (!(o instanceof NumberQueryValue that)) {
             return false;
         }
-        NumberQueryValue that = (NumberQueryValue) o;
         return Objects.equals(number, that.number);
     }
 

diff --git a/...nication-query/src/main/java/org/eclipse/jnosql/communication/query/StringQueryValue.java b/...nication-query/src/main/java/org/eclipse/jnosql/communication/query/StringQueryValue.java
@@ -36,10 +36,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof StringQueryValue)) {
+        if (!(o instanceof StringQueryValue that)) {
             return false;
         }
-        StringQueryValue that = (StringQueryValue) o;
         return Objects.equals(value, that.value);
     }
 

diff --git a/...communication-query/src/main/java/org/eclipse/jnosql/communication/query/UpdateQuery.java b/...communication-query/src/main/java/org/eclipse/jnosql/communication/query/UpdateQuery.java
@@ -66,10 +66,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof UpdateQuery)) {
+        if (!(o instanceof UpdateQuery that)) {
             return false;
         }
-        UpdateQuery that = (UpdateQuery) o;
         return Objects.equals(entity, that.entity) &&
                 Objects.equals(conditions, that.conditions);
     }

diff --git a/...nosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/Where.java b/...nosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/Where.java
@@ -41,10 +41,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof Where)) {
+        if (!(o instanceof Where that)) {
             return false;
         }
-        Where that = (Where) o;
         return Objects.equals(condition, that.condition);
     }
 

diff --git a/...n-query/src/main/java/org/eclipse/jnosql/communication/query/method/MethodArrayValue.java b/...n-query/src/main/java/org/eclipse/jnosql/communication/query/method/MethodArrayValue.java
@@ -35,10 +35,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof MethodArrayValue)) {
+        if (!(o instanceof MethodArrayValue that)) {
             return false;
         }
-        MethodArrayValue that = (MethodArrayValue) o;
         return Arrays.equals(values, that.values);
     }
 

diff --git a/...ry/src/main/java/org/eclipse/jnosql/communication/query/method/MethodParamQueryValue.java b/...ry/src/main/java/org/eclipse/jnosql/communication/query/method/MethodParamQueryValue.java
@@ -35,10 +35,9 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof MethodParamQueryValue)) {
+        if (!(o instanceof MethodParamQueryValue that)) {
             return false;
         }
-        MethodParamQueryValue that = (MethodParamQueryValue) o;
         return Objects.equals(value, that.value);
     }