feat: upgrade find query

Signed-off-by: Otavio Santana <otaviopolianasantana@gmail.com>
eclipse · Apr 11, 2024 · acee6df · acee6df
1 parent d6d8053
commit acee6df
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/.../java/org/eclipse/jnosql/lite/mapping/repository/AnnotationQueryRepositoryReturnType.java b/.../java/org/eclipse/jnosql/lite/mapping/repository/AnnotationQueryRepositoryReturnType.java
@@ -35,7 +35,7 @@ public List<String> apply(MethodMetadata metadata) {
         public List<String> apply(MethodMetadata metadata) {
             List<String> lines = new ArrayList<>();
             lines.add("Stream<" + getEntity(metadata) + "> entities = prepare.result()");
-            lines.add("java.util.List<" + getEntity(metadata) + "> result = entities.collect(java.util.stream.Collectors.toList())");
+            lines.add("java.util.List<" + getEntity(metadata) + "> result = entities.toList()");
             return lines;
         }
     }, SET {

diff --git a/...main/java/org/eclipse/jnosql/lite/mapping/repository/MethodQueryRepositoryReturnType.java b/...main/java/org/eclipse/jnosql/lite/mapping/repository/MethodQueryRepositoryReturnType.java
@@ -36,7 +36,7 @@ public List<String> apply(MethodMetadata metadata) {
         public List<String> apply(MethodMetadata metadata) {
             List<String> lines = new ArrayList<>();
             lines.add("Stream<" + getEntity(metadata) + "> entities = this.template.select(query)");
-            lines.add("java.util.List<" + getEntity(metadata) + "> result = entities.collect(java.util.stream.Collectors.toList())");
+            lines.add("java.util.List<" + getEntity(metadata) + "> result = entities.toList()");
             return lines;
         }
     }, SET {

diff --git a/...src/main/java/org/eclipse/jnosql/lite/mapping/repository/SemistructuredMethodBuilder.java b/...src/main/java/org/eclipse/jnosql/lite/mapping/repository/SemistructuredMethodBuilder.java
@@ -134,7 +134,8 @@ public List<String> apply(MethodMetadata metadata) {
                     lines.add("sortsJNoSQL.add(jakarta.data.Sort.asc(\"" + order.value() + "\"))");
                 }
             }
-            lines.add("var query = org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredParameterBasedQuery.INSTANCE.toQuery(parametersJNoSQL, sortsJNoSQL, entityMetadata())");
+            lines.add("var query = org.eclipse.jnosql.mapping.semistructured.query.SemiStructuredParameterBasedQuery.INSTANCE."+ SPACE +
+                    "toQueryNative(parametersJNoSQL, sortsJNoSQL, entityMetadata())");
             MethodQueryRepositoryReturnType returnType = MethodQueryRepositoryReturnType.of(metadata);
             lines.addAll(returnType.apply(metadata));
             return lines;