Merge pull request #625 from OmniFish-EE/ondromih-jnosql-contributions-main

refactor: Reduce repetitive code in AbstractMethodQueryParser

Author: otaviojava

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright (c) 2022-2025 Contributors to the Eclipse Foundation
+ *  Copyright (c) 2022,2025 Contributors to the Eclipse Foundation
  *  All rights reserved. This program and the accompanying materials
  *  are made available under the terms of the Eclipse Public License v1.0
  *  and Apache License v2.0 which accompanies this distribution.
@@ -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,76 +112,48 @@ 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
@@ -214,6 +183,13 @@ public void exitOr(MethodParser.OrContext ctx) {
         this.and = false;
     }
 
+    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) {
         ParamQueryValue queryValue = new MethodParamQueryValue(variable);

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

@@ -294,7 +294,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

@@ -502,4 +502,4 @@ void shouldReturnNumberOfUpdatedEntitiesFromUpdateQuery() {
                 .thenReturn(Optional.of(1L));
         Assertions.assertThat(people.updateReturnLong("Ada")).isEqualTo(1L);
     }
-}
+}