feat: activate pmd

Signed-off-by: Otavio Santana <[email protected]>
eclipse-jnosql · Sep 24, 2024 · 61943df · 61943df
1 parent 84aaf3d
commit 61943df
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 16 deletions.
diff --git a/...e/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepository.java b/...e/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepository.java
@@ -23,6 +23,7 @@
  */
 public abstract class AbstractKeyValueRepository<T, K> extends AbstractRepository<T, K> {
 
+    @Override
     protected abstract KeyValueTemplate template();
 
     @Override

diff --git a/.../main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java b/.../main/java/org/eclipse/jnosql/mapping/keyvalue/query/AbstractKeyValueRepositoryProxy.java
@@ -26,6 +26,7 @@ public abstract class AbstractKeyValueRepositoryProxy<T, K> extends AbstractRepo
 
     protected abstract Class<T> type();
 
+    @Override
     protected abstract Class<?> repositoryType();
 
 

diff --git a/...value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java b/...value/src/main/java/org/eclipse/jnosql/mapping/keyvalue/query/RepositoryKeyValueBean.java
@@ -70,12 +70,13 @@ public Class<?> getBeanClass() {
     }
 
 
+    @SuppressWarnings("unchecked")
     @Override
     public T create(CreationalContext<T> creationalContext) {
         KeyValueTemplate template = provider.isEmpty() ? getInstance(KeyValueTemplate.class) :
                 getInstance(KeyValueTemplate.class, DatabaseQualifier.ofKeyValue(provider));
         EntitiesMetadata entities = getInstance(EntitiesMetadata.class);
-        KeyValueRepositoryProxy handler = new KeyValueRepositoryProxy(type, entities, template);
+        var handler = new KeyValueRepositoryProxy<>(type, entities, template);
         return (T) Proxy.newProxyInstance(type.getClassLoader(),
                 new Class[]{type},
                 handler);
@@ -97,4 +98,4 @@ public String getId() {
         return type.getName() + '@' + DatabaseType.KEY_VALUE + "-" + provider;
     }
 
-}
+}
diff --git a/...emistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/FieldConverter.java b/...emistructured/src/main/java/org/eclipse/jnosql/mapping/semistructured/FieldConverter.java
@@ -111,13 +111,13 @@ public <X, Y, T> void convert(T instance, List<Element> columns, Element element
                     var array = arrayFieldMetadata.arrayInstance(elements);
                     field.write(instance, array);
                 } else {
-                    executeNoEmbeddableField(instance, element, field, converter, arrayFieldMetadata);
+                    executeNoEmbeddableField(instance, element, field, arrayFieldMetadata);
                 }
             }
         }
 
 
-        private <X, Y, T> void executeNoEmbeddableField(T instance, Element element, FieldMetadata field, EntityConverter converter,
+        private <X, Y, T> void executeNoEmbeddableField(T instance, Element element, FieldMetadata field,
                                                         ArrayFieldMetadata arrayFieldMetadata) {
             var elements = new ArrayList<>();
             var value = element.get();
@@ -136,7 +136,7 @@ private <X, Y, T> void executeNoEmbeddableField(T instance, Element element, Fie
             field.write(instance, array);
         }
 
-        private <X, Y> void executeIterable(ArrayFieldMetadata arrayFieldMetadata, Iterable<?> iterable, ArrayList<Object> elements) {
+        private <X, Y> void executeIterable(ArrayFieldMetadata arrayFieldMetadata, Iterable<?> iterable, List<Object> elements) {
             for (Object item : iterable) {
                 elements.add(Value.of(item).get(arrayFieldMetadata.elementType()));
             }

diff --git a/...ava/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepository.java b/...ava/org/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepository.java
@@ -37,6 +37,7 @@
  */
 public abstract class AbstractSemiStructuredRepository<T, K> extends AbstractRepository<T, K> {
 
+    @Override
     protected abstract SemiStructuredTemplate template();
 
     @Override

diff --git a/...rg/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepositoryProxy.java b/...rg/eclipse/jnosql/mapping/semistructured/query/AbstractSemiStructuredRepositoryProxy.java
@@ -26,12 +26,13 @@
 import org.eclipse.jnosql.mapping.metadata.EntityMetadata;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
+import static java.util.stream.Collectors.toList;
+
 /**
  * Template method to Repository proxy on column
  *
@@ -138,12 +139,15 @@ protected Object executeParameterBased(Object instance, Method method, Object[]
     }
 
     private static List<Sort<?>> getSorts(Method method, EntityMetadata metadata) {
-        List<Sort<?>> sorts = new ArrayList<>();
-        OrderBy[] orders = method.getAnnotationsByType(OrderBy.class);
-        Stream.of(orders)
-                .map(o -> (o.descending() ? Sort.desc(metadata.columnField(o.value())) : Sort.asc(metadata.columnField(o.value()))))
-                .forEach(sorts::add);
-        return sorts;
+        return Stream.of(method.getAnnotationsByType(OrderBy.class))
+                .map(order -> {
+                    String column = metadata.columnField(order.value());
+                    if (column == null || column.isEmpty()) {
+                        throw new IllegalArgumentException("Invalid field in @OrderBy: " + order.value());
+                    }
+                    return order.descending() ? Sort.desc(column) : Sort.asc(column);
+                })
+                .collect(toList());
     }
 
 }
diff --git a/...in/java/org/eclipse/jnosql/mapping/semistructured/query/BaseSemiStructuredRepository.java b/...in/java/org/eclipse/jnosql/mapping/semistructured/query/BaseSemiStructuredRepository.java
@@ -60,6 +60,11 @@ public abstract class BaseSemiStructuredRepository<T, K> extends AbstractReposit
     private static final DeleteQueryParser DELETE_PARSER = new DeleteQueryParser();
     private static final Object[] EMPTY_PARAM = new Object[0];
 
+    private CommunicationObserverParser parser;
+
+    private ParamsBinder paramsBinder;
+
+
     /**
      * Retrieves the Converters instance responsible for converting data types.
      *
@@ -72,6 +77,7 @@ public abstract class BaseSemiStructuredRepository<T, K> extends AbstractReposit
      *
      * @return The EntityMetadata instance.
      */
+    @Override
     protected abstract EntityMetadata entityMetadata();
 
     /**
@@ -81,10 +87,6 @@ public abstract class BaseSemiStructuredRepository<T, K> extends AbstractReposit
      */
     protected abstract SemiStructuredTemplate template();
 
-    private CommunicationObserverParser parser;
-
-    private ParamsBinder paramsBinder;
-
 
     protected org.eclipse.jnosql.communication.semistructured.SelectQuery query(Method method, Object[] args) {
         var provider = SelectMethodProvider.INSTANCE;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,6 +26,7 @@ public abstract class AbstractKeyValueRepositoryProxy<T, K> extends AbstractRepo

		protected abstract Class<T> type();

		@Override
		protected abstract Class<?> repositoryType();


Expand Down