From b4cfba952006fc0618ac6a1504816b211797cd12 Mon Sep 17 00:00:00 2001 From: Otavio Santana Date: Fri, 13 Sep 2024 08:50:15 +0100 Subject: [PATCH] feat: fix imports issues Signed-off-by: Otavio Santana --- .../AnnotationOperationMethodBuilder.java | 30 ++++++++++--------- .../resources/repository_key-value.mustache | 3 +- .../repository_semi_structure.mustache | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/jnosql-lite/mapping-lite-processor/src/main/java/org/eclipse/jnosql/lite/mapping/repository/AnnotationOperationMethodBuilder.java b/jnosql-lite/mapping-lite-processor/src/main/java/org/eclipse/jnosql/lite/mapping/repository/AnnotationOperationMethodBuilder.java index cbbb8ad6..4780f621 100644 --- a/jnosql-lite/mapping-lite-processor/src/main/java/org/eclipse/jnosql/lite/mapping/repository/AnnotationOperationMethodBuilder.java +++ b/jnosql-lite/mapping-lite-processor/src/main/java/org/eclipse/jnosql/lite/mapping/repository/AnnotationOperationMethodBuilder.java @@ -33,12 +33,13 @@ public List apply(MethodMetadata methodMetadata) { return Collections.singletonList( "this.template.insert(" + parameter.name() + ")"); } else if(isInt){ return List.of("this.template.insert(" + parameter.name() + ")", - "int resultJNoSQL = (int)stream("+ parameter.name()+ ".spliterator(), false).count()"); + "int resultJNoSQL = (int)java.util.stream.StreamSupport.stream("+ parameter.name()+ ".spliterator(), false).count()"); } else if (isLong) { return List.of("this.template.insert(" + parameter.name() + ")", - "long resultJNoSQL = stream(" + parameter.name() + ".spliterator(), false).count()"); + "long resultJNoSQL = java.util.stream.StreamSupport.stream(" + parameter.name() + ".spliterator(), false).count()"); } - return Collections.singletonList( "var resultJNoSQL = stream(this.template.insert(" + parameter.name() + ").spliterator(), false).toList()"); + return Collections.singletonList( "var resultJNoSQL = " + + "java.util.stream.StreamSupport.stream(this.template.insert(" + parameter.name() + ").spliterator(), false).toList()"); } else if(parameter.isArray()){ if(isVoid) { @@ -51,7 +52,7 @@ public List apply(MethodMetadata methodMetadata) { "long resultJNoSQL = (long)" + parameter.name() + ".length"); } return List.of("var insertResult = this.template.insert(java.util.Arrays.stream(" + parameter.name() + ").toList())", - "var resultJNoSQL = stream(insertResult.spliterator(), false).toArray("+ + "var resultJNoSQL = java.util.stream.StreamSupport.stream(insertResult.spliterator(), false).toArray("+ parameter.arrayType()+"::new)"); } if(isVoid) { @@ -76,10 +77,10 @@ public List apply(MethodMetadata methodMetadata) { return Collections.singletonList( "this.saveAll(" + parameter.name() + ")"); } else if(isInt){ return List.of("this.saveAll(" + parameter.name() + ")", - "int resultJNoSQL = (int)stream("+ parameter.name()+ ".spliterator(), false).count()"); + "int resultJNoSQL = (int)java.util.stream.StreamSupport.stream("+ parameter.name()+ ".spliterator(), false).count()"); }else if(isLong){ return List.of("this.saveAll(" + parameter.name() + ")", - "long resultJNoSQL = stream("+ parameter.name()+ ".spliterator(), false).count()"); + "long resultJNoSQL = java.util.stream.StreamSupport.stream("+ parameter.name()+ ".spliterator(), false).count()"); } return Collections.singletonList( "var resultJNoSQL = this.saveAll(" + parameter.name() + ")"); } else if(parameter.isArray()){ @@ -94,7 +95,7 @@ public List apply(MethodMetadata methodMetadata) { "long resultJNoSQL = (long)" + parameter.name() + ".length"); } return List.of("var saveResult = this.saveAll(java.util.Arrays.stream(" + parameter.name() + ").toList())", - "var resultJNoSQL = stream(saveResult.spliterator(), false).toArray("+ + "var resultJNoSQL = java.util.stream.StreamSupport.stream(saveResult.spliterator(), false).toArray("+ parameter.arrayType()+"::new)"); } if(isVoid) { @@ -120,12 +121,13 @@ public List apply(MethodMetadata methodMetadata) { return Collections.singletonList( "this.template.update(" + parameter.name() + ")"); } else if(isInt){ return List.of("this.template.update(" + parameter.name() + ")", - "int resultJNoSQL = (int)stream("+ parameter.name()+ ".spliterator(), false).count()"); + "int resultJNoSQL = (int)java.util.stream.StreamSupport.stream("+ parameter.name()+ ".spliterator(), false).count()"); } else if(isLong){ return List.of("this.template.update(" + parameter.name() + ")", - "long resultJNoSQL = stream("+ parameter.name()+ ".spliterator(), false).count()"); + "long resultJNoSQL = java.util.stream.StreamSupport.stream("+ parameter.name()+ ".spliterator(), false).count()"); } - return Collections.singletonList( "var resultJNoSQL = stream(this.template.update(" + parameter.name() + ").spliterator(), false).toList()"); + return Collections.singletonList( "var resultJNoSQL = " + + "java.util.stream.StreamSupport.stream(this.template.update(" + parameter.name() + ").spliterator(), false).toList()"); } else if(parameter.isArray()){ if(isVoid) { @@ -138,7 +140,7 @@ public List apply(MethodMetadata methodMetadata) { "long resultJNoSQL = (long)" + parameter.name() + ".length"); } return List.of("var insertResult = this.template.update(java.util.Arrays.stream(" + parameter.name() + ").toList())", - "var resultJNoSQL = stream(insertResult.spliterator(), false).toArray("+ + "var resultJNoSQL = java.util.stream.StreamSupport.stream(insertResult.spliterator(), false).toArray("+ parameter.arrayType()+"::new)"); } if(isVoid) { @@ -166,10 +168,10 @@ public List apply(MethodMetadata methodMetadata) { return Collections.singletonList( "this.deleteAll(" + parameter.name() + ")"); } else if(isInt){ return List.of("this.deleteAll(" + parameter.name() + ")", - "int resultJNoSQL = (int)stream("+ parameter.name()+ ".spliterator(), false).count()"); + "int resultJNoSQL = (int)java.util.stream.StreamSupport.stream("+ parameter.name()+ ".spliterator(), false).count()"); } else if(isLong){ return List.of("this.deleteAll(" + parameter.name() + ")", - "long resultJNoSQL = stream("+ parameter.name()+ ".spliterator(), false).count()"); + "long resultJNoSQL = java.util.stream.StreamSupport.stream("+ parameter.name()+ ".spliterator(), false).count()"); } else if (isBoolean) { return List.of("this.deleteAll(" + parameter.name() + ")", "boolean resultJNoSQL = true"); @@ -191,7 +193,7 @@ public List apply(MethodMetadata methodMetadata) { } return List.of("var insertResultJNoSQL = this.deleteAll(java.util.Arrays.stream(" + parameter.name() + ").toList())", - "var resultJNoSQL = stream(insertResultJNoSQL.spliterator(), false).toArray("+ + "var resultJNoSQL = java.util.stream.StreamSupport.stream(insertResultJNoSQL.spliterator(), false).toArray("+ parameter.arrayType()+"::new)"); } if(isVoid) { diff --git a/jnosql-lite/mapping-lite-processor/src/main/resources/repository_key-value.mustache b/jnosql-lite/mapping-lite-processor/src/main/resources/repository_key-value.mustache index 59a4bdcc..fb951b2e 100644 --- a/jnosql-lite/mapping-lite-processor/src/main/resources/repository_key-value.mustache +++ b/jnosql-lite/mapping-lite-processor/src/main/resources/repository_key-value.mustache @@ -38,7 +38,6 @@ import java.util.stream.StreamSupport; import static java.util.Objects.requireNonNull; -import static java.util.stream.StreamSupport.stream; import static org.eclipse.jnosql.mapping.IdNotFoundException.KEY_NOT_FOUND_EXCEPTION_SUPPLIER; @ApplicationScoped @@ -187,4 +186,4 @@ public class {{className}} implements {{repository}} { {{/methods}} -} \ No newline at end of file +} diff --git a/jnosql-lite/mapping-lite-processor/src/main/resources/repository_semi_structure.mustache b/jnosql-lite/mapping-lite-processor/src/main/resources/repository_semi_structure.mustache index b656b141..55938ccc 100644 --- a/jnosql-lite/mapping-lite-processor/src/main/resources/repository_semi_structure.mustache +++ b/jnosql-lite/mapping-lite-processor/src/main/resources/repository_semi_structure.mustache @@ -237,4 +237,4 @@ public class {{className}} implements {{repository}} { return (Class<{{entityType}}>) entityMetadata().type(); } -} \ No newline at end of file +}