[DE-838] SonarCloud fixes (#566)

rashtao · web-flow · commit 14545be26592 · 2024-07-29T15:41:47.000+02:00
* Sonar: exclude GraalVM substitutions

* SonarLint

* SonarLint fixes
diff --git a/core/src/main/java/com/arangodb/internal/InternalArangoSearch.java b/core/src/main/java/com/arangodb/internal/InternalArangoSearch.java
@@ -28,11 +28,9 @@
 public class InternalArangoSearch extends InternalArangoView {
 
     private static final String PROPERTIES_PATH = "properties";
-    private final String dbName;
 
     protected InternalArangoSearch(final ArangoExecuteable executeable, final String dbName, final String name) {
         super(executeable, dbName, name);
-        this.dbName = dbName;
     }
 
     protected InternalRequest getPropertiesRequest() {
diff --git a/core/src/main/java/com/arangodb/internal/InternalSearchAlias.java b/core/src/main/java/com/arangodb/internal/InternalSearchAlias.java
@@ -25,11 +25,9 @@
 public class InternalSearchAlias extends InternalArangoView {
 
     private static final String PROPERTIES_PATH = "properties";
-    private final String dbName;
 
     protected InternalSearchAlias(final ArangoExecuteable executeable, final String dbName, final String name) {
         super(executeable, dbName, name);
-        this.dbName = dbName;
     }
 
     protected InternalRequest getPropertiesRequest() {
diff --git a/core/src/main/java/com/arangodb/model/AbstractMDIndexOptions.java b/core/src/main/java/com/arangodb/model/AbstractMDIndexOptions.java
@@ -39,7 +39,7 @@ public abstract class AbstractMDIndexOptions<T extends AbstractMDIndexOptions<T>
     private Iterable<String> storedValues;
 
 
-    public AbstractMDIndexOptions() {
+    protected AbstractMDIndexOptions() {
         super();
     }
 
diff --git a/core/src/main/java/com/arangodb/util/UnicodeUtils.java b/core/src/main/java/com/arangodb/util/UnicodeUtils.java
@@ -21,6 +21,7 @@
 package com.arangodb.util;
 
 import java.text.Normalizer;
+import java.util.Objects;
 
 /**
  * @author Mark Vollmary
@@ -45,6 +46,7 @@ public static String normalize(final String value) {
     }
 
     public static boolean isNormalized(final String value) {
-        return normalize(value).equals(value);
+        Objects.requireNonNull(value);
+        return value.equals(normalize(value));
     }
 }
diff --git a/shaded/pom.xml b/shaded/pom.xml
@@ -18,6 +18,7 @@
     <properties>
         <moduleName>com.arangodb.driver</moduleName>
         <maven.deploy.skip>false</maven.deploy.skip>
+        <sonar.exclusions>src/main/java/graal/**/*</sonar.exclusions>
     </properties>
 
     <dependencies>
diff --git a/test-functional/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java b/test-functional/src/test/java/com/arangodb/ArangoEdgeCollectionTest.java
@@ -30,7 +30,6 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.stream.Stream;
 
diff --git a/test-functional/src/test/java/com/arangodb/ArangoVertexCollectionTest.java b/test-functional/src/test/java/com/arangodb/ArangoVertexCollectionTest.java
@@ -25,7 +25,6 @@
 import com.arangodb.entity.VertexUpdateEntity;
 import com.arangodb.model.*;
 import com.arangodb.util.RawJson;
-import com.arangodb.util.TestUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
diff --git a/test-functional/src/test/java/com/arangodb/ArangoViewTest.java b/test-functional/src/test/java/com/arangodb/ArangoViewTest.java
@@ -22,7 +22,6 @@
 
 import com.arangodb.entity.ViewEntity;
 import com.arangodb.entity.ViewType;
-import com.arangodb.util.TestUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
diff --git a/test-functional/src/test/java/com/arangodb/StreamTransactionGraphAsyncTest.java b/test-functional/src/test/java/com/arangodb/StreamTransactionGraphAsyncTest.java
@@ -29,7 +29,6 @@
 
 import java.util.Collections;
 import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 import java.util.stream.Stream;
 
diff --git a/test-functional/src/test/java/com/arangodb/StreamTransactionTest.java b/test-functional/src/test/java/com/arangodb/StreamTransactionTest.java
@@ -426,9 +426,9 @@ void replaceDocuments(ArangoDatabase db) {
         StreamTransactionEntity tx = db.beginStreamTransaction(
                 new StreamTransactionOptions().readCollections(COLLECTION_NAME).writeCollections(COLLECTION_NAME));
 
-        List<BaseDocument> modifiedDocs = createdDocs.stream().peek(doc -> {
-            doc.updateAttribute("test", "bar");
-        }).collect(Collectors.toList());
+        List<BaseDocument> modifiedDocs = createdDocs.stream()
+                .peek(doc -> doc.updateAttribute("test", "bar"))
+                .collect(Collectors.toList());
 
         // replace document from within the tx
         collection
@@ -511,9 +511,9 @@ void updateDocuments(ArangoDatabase db) {
         StreamTransactionEntity tx = db.beginStreamTransaction(
                 new StreamTransactionOptions().readCollections(COLLECTION_NAME).writeCollections(COLLECTION_NAME));
 
-        List<BaseDocument> modifiedDocs = createdDocs.stream().peek(doc -> {
-            doc.updateAttribute("test", "bar");
-        }).collect(Collectors.toList());
+        List<BaseDocument> modifiedDocs = createdDocs.stream()
+                .peek(doc -> doc.updateAttribute("test", "bar"))
+                .collect(Collectors.toList());
 
         // update documents from within the tx
         collection
diff --git a/test-non-functional/src/test/java/arch/ArchUtils.java b/test-non-functional/src/test/java/arch/ArchUtils.java
@@ -13,7 +13,7 @@ class ArchUtils {
 
     static class JavaTypeExt {
         static DescribedPredicate<JavaType> rawTypes(DescribedPredicate<? super JavaClass> predicate) {
-            return new DescribedPredicate<JavaType>("raw types " + predicate.getDescription()) {
+            return new DescribedPredicate<>("raw types " + predicate.getDescription()) {
                 @Override
                 public boolean test(JavaType t) {
                     if (t.toErasure().isAnnotatedWith(NoRawTypesInspection.class)) {
@@ -27,7 +27,7 @@ public boolean test(JavaType t) {
     }
 
     static class HasReturnTypeExt {
-        private static final ChainableFunction<HasReturnType, JavaType> GET_RETURN_TYPE = new ChainableFunction<HasReturnType, JavaType>() {
+        private static final ChainableFunction<HasReturnType, JavaType> GET_RETURN_TYPE = new ChainableFunction<>() {
             @Override
             public JavaType apply(HasReturnType input) {
                 return input.getReturnType();
@@ -40,7 +40,7 @@ static DescribedPredicate<HasReturnType> returnType(DescribedPredicate<? super J
     }
 
     static class HasTypeExt {
-        private static final ChainableFunction<HasType, JavaType> GET_TYPE = new ChainableFunction<HasType, JavaType>() {
+        private static final ChainableFunction<HasType, JavaType> GET_TYPE = new ChainableFunction<>() {
             @Override
             public JavaType apply(HasType input) {
                 return input.getType();
diff --git a/test-non-functional/src/test/java/arch/InternalsTest.java b/test-non-functional/src/test/java/arch/InternalsTest.java
@@ -147,7 +147,7 @@ public class InternalsTest {
             .should(be(paramPredicate));
 
     private static DescribedPredicate<JavaClass> superclasses(DescribedPredicate<? super JavaClass> predicate) {
-        return new DescribedPredicate<JavaClass>("superclasses " + predicate.getDescription()) {
+        return new DescribedPredicate<>("superclasses " + predicate.getDescription()) {
             @Override
             public boolean test(JavaClass clazz) {
                 return Stream.of(
@@ -162,7 +162,7 @@ public boolean test(JavaClass clazz) {
     }
 
     private static DescribedPredicate<JavaCodeUnit> haveParams(DescribedPredicate<? super JavaParameter> predicate) {
-        return new DescribedPredicate<JavaCodeUnit>("have params " + predicate.getDescription()) {
+        return new DescribedPredicate<>("have params " + predicate.getDescription()) {
             @Override
             public boolean test(JavaCodeUnit method) {
                 return method.getParameters().stream().allMatch(predicate);
diff --git a/test-non-functional/src/test/java/serde/JacksonSerdeTest.java b/test-non-functional/src/test/java/serde/JacksonSerdeTest.java
@@ -4,10 +4,7 @@
 import com.arangodb.ContentType;
 import com.arangodb.Protocol;
 import com.arangodb.config.ArangoConfigProperties;
-import com.arangodb.internal.serde.InternalSerdeProvider;
 import com.arangodb.serde.jackson.JacksonSerde;
-import com.arangodb.serde.jackson.json.JacksonJsonSerdeProvider;
-import com.arangodb.serde.jackson.vpack.JacksonVPackSerdeProvider;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.arangodb.util.RawJson;

Original file line number	Diff line number	Diff line change
`@@ -28,11 +28,9 @@`
`28`	`28`	`public class InternalArangoSearch extends InternalArangoView {`
`29`	`29`
`30`	`30`	`private static final String PROPERTIES_PATH = "properties";`
`31`		`- private final String dbName;`
`32`	`31`
`33`	`32`	`protected InternalArangoSearch(final ArangoExecuteable executeable, final String dbName, final String name) {`
`34`	`33`	`super(executeable, dbName, name);`
`35`		`- this.dbName = dbName;`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`protected InternalRequest getPropertiesRequest() {`
Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,9 @@`
`25`	`25`	`public class InternalSearchAlias extends InternalArangoView {`
`26`	`26`
`27`	`27`	`private static final String PROPERTIES_PATH = "properties";`
`28`		`- private final String dbName;`
`29`	`28`
`30`	`29`	`protected InternalSearchAlias(final ArangoExecuteable executeable, final String dbName, final String name) {`
`31`	`30`	`super(executeable, dbName, name);`
`32`		`- this.dbName = dbName;`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`protected InternalRequest getPropertiesRequest() {`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public abstract class AbstractMDIndexOptions<T extends AbstractMDIndexOptions<T>`
`39`	`39`	`private Iterable<String> storedValues;`
`40`	`40`
`41`	`41`
`42`		`- public AbstractMDIndexOptions() {`
	`42`	`+ protected AbstractMDIndexOptions() {`
`43`	`43`	`super();`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`package com.arangodb.util;`
`22`	`22`
`23`	`23`	`import java.text.Normalizer;`
	`24`	`+import java.util.Objects;`
`24`	`25`
`25`	`26`	`/**`
`26`	`27`	`* @author Mark Vollmary`
`@@ -45,6 +46,7 @@ public static String normalize(final String value) {`
`45`	`46`	`}`
`46`	`47`
`47`	`48`	`public static boolean isNormalized(final String value) {`
`48`		`- return normalize(value).equals(value);`
	`49`	`+ Objects.requireNonNull(value);`
	`50`	`+ return value.equals(normalize(value));`
`49`	`51`	`}`
`50`	`52`	`}`