Merge pull request #528 from OmniFish-EE/ondromih-fix-reflection-utils

Fix for #527: Handling special parameters

jnosql-mapping/jnosql-mapping-core/pom.xml

@@ -1,17 +1,17 @@
 <!--
-  ~  Copyright (c) 2022 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.
-  ~   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
-  ~   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
-  ~
-  ~   You may elect to redistribute this code under either of these licenses.
-  ~
-  ~   Contributors:
-  ~
-  ~   Otavio Santana
-  -->
+~  Copyright (c) 2022 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.
+~   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+~   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+~
+~   You may elect to redistribute this code under either of these licenses.
+~
+~   Contributors:
+~
+~   Otavio Santana
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -42,4 +42,30 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>parameters-testCompile</id>
+                        <phase>test-compile</phase>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                        <configuration>
+                            <compileSourceRoots>
+                                <compileSourceRoot>${basedir}${file.separator}src${file.separator}test${file.separator}java-parameters</compileSourceRoot>
+                            </compileSourceRoots>
+                            <compilerArgs>
+                                <!-- to keep parameter names for code under test -->
+                                <arg>-parameters</arg>
+                            </compilerArgs>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>

jnosql-mapping/jnosql-mapping-core/src/main/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtils.java

@@ -47,13 +47,14 @@ public Map<String, Object> getParams(Method method, Object[] args) {
         int queryIndex = 1;
         for (int index = 0; index < parameters.length; index++) {
             Parameter parameter = parameters[index];
-            boolean isNotSpecialParameter = SpecialParameters.isNotSpecialParameter(parameter);
+            boolean isNotSpecialParameter = SpecialParameters.isNotSpecialParameter(parameter.getType());
             Param param = parameter.getAnnotation(Param.class);
             if (Objects.nonNull(param)) {
                 params.put(param.value(), args[index]);
-            } else if (parameter.isNamePresent() && isNotSpecialParameter) {
-                params.put(parameter.getName(), args[index]);
             } else if (isNotSpecialParameter) {
+                if (parameter.isNamePresent()) {
+                    params.put(parameter.getName(), args[index]);
+                }
                 params.put("?" + queryIndex++, args[index]);
             }
         }
@@ -73,10 +74,11 @@ public Map<String, Object> getBy(Method method, Object[] args) {
         Parameter[] parameters = method.getParameters();
         for (int index = 0; index < parameters.length; index++) {
             Parameter parameter = parameters[index];
+            boolean isNotSpecialParameter = SpecialParameters.isNotSpecialParameter(parameter.getType());
             By by = parameter.getAnnotation(By.class);
             if (Objects.nonNull(by)) {
                 params.put(by.value(), args[index]);
-            } else if(parameter.isNamePresent()) {
+            } else if(parameter.isNamePresent() && isNotSpecialParameter) {
                 params.put(parameter.getName(), args[index]);
             }
         }

jnosql-mapping/jnosql-mapping-core/src/test/java-parameters/org/eclipse/jnosql/mapping/core/repository/PersonRepositoryCompiledWithParameters.java

@@ -0,0 +1,36 @@
+/*
+ *  Copyright (c) 2023 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.
+ *   The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
+ *   and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php.
+ *
+ *   You may elect to redistribute this code under either of these licenses.
+ *
+ *   Contributors:
+ *
+ *   Ondro Mihalyi
+ */
+package org.eclipse.jnosql.mapping.core.repository;
+
+import jakarta.data.Sort;
+import jakarta.data.repository.BasicRepository;
+import jakarta.data.repository.By;
+import jakarta.data.repository.Param;
+import jakarta.data.repository.Query;
+import java.util.List;
+import org.eclipse.jnosql.mapping.core.entities.Person;
+
+public interface PersonRepositoryCompiledWithParameters extends BasicRepository<Person, String> {
+
+    @Query("FROM Person WHERE name = :name")
+    List<Person> query(@Param("name") @By("name") String name, Sort sort);
+
+    @Query("FROM Person WHERE age = ?1")
+    List<Person> findAge(int age);
+
+    @Query("FROM Person WHERE age = ?1 AND name = ?2")
+    List<Person> findAgeAndName(int age, String name);
+
+}

jnosql-mapping/jnosql-mapping-core/src/test/java/org/eclipse/jnosql/mapping/core/repository/RepositoryReflectionUtilsTest.java

@@ -18,7 +18,6 @@
 import jakarta.data.repository.BasicRepository;
 import jakarta.data.repository.Param;
 import jakarta.data.repository.Query;
-import org.assertj.core.api.Assertions;
 import org.eclipse.jnosql.mapping.core.entities.Person;
 import org.junit.jupiter.api.Test;
 
@@ -31,49 +30,79 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
+import jakarta.data.Sort;
+
 class RepositoryReflectionUtilsTest {
 
+    final Class<?> PERSON_REPOSITORY_COMPILED_WITH_PARAMETERS_CLASS;
+
+    {
+        try {
+            PERSON_REPOSITORY_COMPILED_WITH_PARAMETERS_CLASS = Class.forName(this.getClass().getPackageName() + ".PersonRepositoryCompiledWithParameters");
+        } catch (ClassNotFoundException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
     @Test
-    void shouldGetParams(){
+    void shouldGetParamsWithoutSpecialParams() {
         Method method = Arrays.stream(PersonRepository.class.getDeclaredMethods()).filter(m -> m.getName().equals("query"))
                 .findFirst().orElseThrow();
-        Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getParams(method, new Object[]{"Ada"});
+        final Sort<Object> SPECIAL_PARAM = Sort.asc("");
+        Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getParams(method, new Object[]{"Ada", SPECIAL_PARAM});
         assertThat(params)
                 .hasSize(1)
                 .containsEntry("name", "Ada");
 
     }
 
     @Test
-    void shouldQuery(){
+    void shouldQuery() {
         Method method = Arrays.stream(PersonRepository.class.getDeclaredMethods()).filter(m -> m.getName().equals("query"))
                 .findFirst().orElseThrow();
         String query = RepositoryReflectionUtils.INSTANCE.getQuery(method);
         assertEquals("FROM Person WHERE name = :name", query);
     }
 
     @Test
-    void shouldBy(){
+    void shouldByWithoutSpecialParams() {
         Method method = Arrays.stream(PersonRepository.class.getDeclaredMethods()).filter(m -> m.getName().equals("query"))
                 .findFirst().orElseThrow();
-        Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getBy(method, new Object[]{"Ada"});
+        final Sort<Object> SPECIAL_PARAM = Sort.asc("");
+        Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getBy(method, new Object[]{"Ada", SPECIAL_PARAM});
         assertThat(params)
                 .hasSize(1)
                 .containsEntry("name", "Ada");
     }
 
     @Test
-    void shouldFindByAge(){
+    // for code compiled without -parameters
+    void shouldFindByAgeWithoutParams() {
         Method method = Stream.of(PersonRepository.class.getDeclaredMethods()).filter(m -> m.getName().equals("findAge"))
                 .findFirst().orElseThrow();
         Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getParams(method, new Object[]{10});
+        assertThat(method.getParameters()[0].isNamePresent()).isFalse();
         assertThat(params)
                 .hasSize(1)
                 .containsEntry("?1", 10);
     }
 
     @Test
-    void shouldFindByAgeAndName(){
+    // for code compiled with -parameters
+    void shouldFindByAgeWithParams() throws ClassNotFoundException {
+        Method method = Stream.of(PERSON_REPOSITORY_COMPILED_WITH_PARAMETERS_CLASS.getDeclaredMethods()).filter(m -> m.getName().equals("findAge"))
+                .findFirst().orElseThrow();
+        Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getParams(method, new Object[]{10});
+        assertThat(method.getParameters()[0].isNamePresent()).isTrue();
+        assertThat(params)
+                .hasSize(2)
+                .containsEntry("?1", 10)
+                .containsEntry("age", 10);
+    }
+
+    @Test
+    // for code compiled without -parameters
+    void shouldFindByAgeAndNameWithoutParams() {
         Method method = Stream.of(PersonRepository.class.getDeclaredMethods()).filter(m -> m.getName().equals("findAgeAndName"))
                 .findFirst().orElseThrow();
         Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getParams(method, new Object[]{10, "Ada"});
@@ -83,15 +112,29 @@ void shouldFindByAgeAndName(){
                 .containsEntry("?2", "Ada");
     }
 
+    @Test
+    // for code compiled with -parameters
+    void shouldFindByAgeAndNameWithParams() {
+        Method method = Stream.of(PERSON_REPOSITORY_COMPILED_WITH_PARAMETERS_CLASS.getDeclaredMethods()).filter(m -> m.getName().equals("findAgeAndName"))
+                .findFirst().orElseThrow();
+        Map<String, Object> params = RepositoryReflectionUtils.INSTANCE.getParams(method, new Object[]{10, "Ada"});
+        assertThat(params)
+                .hasSize(4)
+                .containsEntry("?1", 10)
+                .containsEntry("?2", "Ada")
+                .containsEntry("age", 10)
+                .containsEntry("name", "Ada");
+    }
+
     interface PersonRepository extends BasicRepository<Person, String> {
 
         @Query("FROM Person WHERE name = :name")
-        List<Person> query(@Param("name") @By("name")  String name);
+        List<Person> query(@Param("name") @By("name")  String name, Sort sort);
 
         @Query("FROM Person WHERE age = ?1")
         List<Person> findAge(int age);
 
         @Query("FROM Person WHERE age = ?1 AND name = ?2")
         List<Person> findAgeAndName(int age, String name);
     }
-}
+}