Merge pull request #624 from OmniFish-EE/ondromih-jakarta-data-persistence

refactor: Reduce repetitive code in AbstractMethodQueryParser (1.1.x)

Author: otaviojava

jnosql-communication/jnosql-communication-query/src/main/java/org/eclipse/jnosql/communication/query/method/AbstractMethodQueryParser.java

@@ -95,10 +95,7 @@ public void exitSelectStart(MethodParser.SelectStartContext ctx) {
 
     @Override
     public void exitEq(MethodParser.EqContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, EQUALS);
+        exitOperationWithASingleVariable(EQUALS, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
@@ -115,75 +112,47 @@ public void exitUntruth(MethodParser.UntruthContext ctx) {
 
     @Override
     public void exitGt(MethodParser.GtContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, GREATER_THAN);
+        exitOperationWithASingleVariable(GREATER_THAN, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitGte(MethodParser.GteContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, GREATER_EQUALS_THAN);
+        exitOperationWithASingleVariable(GREATER_EQUALS_THAN, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitLt(MethodParser.LtContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, LESSER_THAN);
+        exitOperationWithASingleVariable(LESSER_THAN, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitLte(MethodParser.LteContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, LESSER_EQUALS_THAN);
+        exitOperationWithASingleVariable(LESSER_EQUALS_THAN, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitLike(MethodParser.LikeContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, LIKE);
+        exitOperationWithASingleVariable(LIKE, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitContains(MethodParser.ContainsContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, CONTAINS);
+        exitOperationWithASingleVariable(CONTAINS, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitEndsWith(MethodParser.EndsWithContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, ENDS_WITH);
+        exitOperationWithASingleVariable(ENDS_WITH, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitStartsWith(MethodParser.StartsWithContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        appendCondition(hasNot, ignoreCase, variable, STARTS_WITH);
+        exitOperationWithASingleVariable(STARTS_WITH, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
     public void exitIn(MethodParser.InContext ctx) {
-        boolean hasNot = Objects.nonNull(ctx.not());
-        boolean ignoreCase = Objects.nonNull(ctx.ignoreCase());
-        String variable = getVariable(ctx.variable());
-        Condition operator = IN;
-        appendCondition(hasNot, ignoreCase, variable, operator);
+        exitOperationWithASingleVariable(IN, ctx.not(), ctx.variable(), ctx.ignoreCase());
     }
 
     @Override
@@ -213,9 +182,12 @@ public void exitOr(MethodParser.OrContext ctx) {
         this.and = false;
     }
 
-    private void appendCondition(boolean hasNot, String variable, Condition operator) {
-        ParamQueryValue queryValue = new MethodParamQueryValue(variable);
-        checkCondition(new MethodCondition(variable, operator, queryValue), hasNot);
+    private void exitOperationWithASingleVariable(Condition operator, MethodParser.NotContext notContext,
+            MethodParser.VariableContext variableContext, MethodParser.IgnoreCaseContext ignoreCaseContext) {
+        boolean hasNot = Objects.nonNull(notContext);
+        boolean isIgnoreCase = Objects.nonNull(ignoreCaseContext);
+        String variable = getVariable(variableContext);
+        appendCondition(hasNot, isIgnoreCase, variable, operator);
     }
 
     private void appendCondition(boolean hasNot, boolean ignoreCase, String variable, Condition operator) {
@@ -239,7 +211,6 @@ private void checkCondition(QueryCondition condition, boolean hasNot, boolean ig
         } else {
             appendCondition(OR, newCondition);
         }
-
     }
 
     private String getVariable(MethodParser.VariableContext ctx) {

jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/query/AnnotationOperation.java

@@ -209,7 +209,7 @@ private static List<Object> getArray(Object param) {
     }
 
     private static void checkParameterNumber(Operation operation) {
-        if (operation.params.length != 1) {
+        if (operation.params == null || operation.params.length != 1) {
             throw new UnsupportedOperationException("The method operation requires one parameter, please check the method: "
                     + operation.method);
         }

jnosql-mapping/jnosql-mapping-semistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/query/CustomRepositoryHandler.java

@@ -224,7 +224,7 @@ public static CustomRepositoryHandlerBuilder builder() {
                     LOGGER.fine(() -> "The default repository found: " + method);
                     return repository(method);
                 }
-                case SAVE, INSERT, DELETE, UPDATE -> {
+                case SAVE, INSERT, UPDATE -> {
                     LOGGER.fine(() -> "The default repository found: " + method);
                     return repository(method, method.getParameters());
                 }
@@ -290,7 +290,6 @@ private record RepositoryMetadata(Class<?> typeClass, Optional<EntityMetadata> m
         if( typeClass == null) {
             return defaultRepository.repository();
         }
-
         if (typeClass.isArray()) {
             typeClass = typeClass.getComponentType();
         } else if (IS_GENERIC_SUPPORTED_TYPE.test(typeClass)) {

jnosql-mapping/jnosql-mapping-semistructured/src/test/java/org/eclipse/jnosql/mapping/semistructured/query/CustomRepositoryHandlerTest.java

@@ -504,4 +504,4 @@ void shouldReturnNumberOfUpdatedEntitiesFromUpdateQuery() {
                 .thenReturn(Stream.of(Person.builder().age(26).name("Ada").build()));
         Assertions.assertThat(people.updateReturnInt("Ada")).isEqualTo(1L);
     }
-}
+}