Merge pull request #8525 from neo-technology/shush

Shush build, please
neo4j · Dec 28, 2023 · 74426d2 · 74426d2
2 parents 0f7e2cd + 9d7cacd
commit 74426d2
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 29 deletions.
diff --git a/applications/graph-store-catalog/build.gradle b/applications/graph-store-catalog/build.gradle
@@ -12,6 +12,7 @@ dependencies {
     annotationProcessor group: 'org.immutables', name: 'value', version: ver.'immutables'
     compileOnly group: 'org.immutables', name: 'value-annotations', version: ver.'immutables'
     compileOnly group: 'org.jetbrains', name: 'annotations', version: ver.'jetbrains-annotations'
+    compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
     // DependencyResolver, which we should get rid of
     compileOnly(group: 'org.neo4j', name: 'neo4j-common', version: ver.'neo4j') { transitive = false }
@@ -48,6 +49,8 @@ dependencies {
     implementation project(':termination')
     implementation project(':transaction')
 
+    testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
+
     testImplementation group: 'org.assertj', name: 'assertj-core', version: ver.'assertj'
     testImplementation platform(dep.junit5bom)
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: ver.'junit5bom'

diff --git a/compatibility/5.10/storage-engine-adapter/build.gradle b/compatibility/5.10/storage-engine-adapter/build.gradle
@@ -58,6 +58,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.10'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.10'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.11/storage-engine-adapter/build.gradle b/compatibility/5.11/storage-engine-adapter/build.gradle
@@ -58,6 +58,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.11'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.11'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.12/storage-engine-adapter/build.gradle b/compatibility/5.12/storage-engine-adapter/build.gradle
@@ -58,6 +58,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.12'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.12'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.13/storage-engine-adapter/build.gradle b/compatibility/5.13/storage-engine-adapter/build.gradle
@@ -58,6 +58,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.13'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.13'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.14/storage-engine-adapter/build.gradle b/compatibility/5.14/storage-engine-adapter/build.gradle
@@ -58,6 +58,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.14'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.14'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.15/storage-engine-adapter/build.gradle b/compatibility/5.15/storage-engine-adapter/build.gradle
@@ -58,6 +58,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.15'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.15'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.6/storage-engine-adapter/build.gradle b/compatibility/5.6/storage-engine-adapter/build.gradle
@@ -59,6 +59,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.6'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.6'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.7/storage-engine-adapter/build.gradle b/compatibility/5.7/storage-engine-adapter/build.gradle
@@ -59,6 +59,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.7'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.7'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.8/storage-engine-adapter/build.gradle b/compatibility/5.8/storage-engine-adapter/build.gradle
@@ -59,6 +59,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.8'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.8'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/compatibility/5.9/storage-engine-adapter/build.gradle b/compatibility/5.9/storage-engine-adapter/build.gradle
@@ -58,6 +58,7 @@ if (ver.'neo4j'.startsWith('5.')) {
         java17CompileOnly group: 'org.immutables', name: 'value-annotations',           version: ver.'immutables'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j',                       version: neos.'5.9'
         java17CompileOnly group: 'org.neo4j',      name: 'neo4j-record-storage-engine', version: neos.'5.9'
+        java17CompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
         java17Implementation project(':core')
         java17Implementation project(':storage-engine-adapter-api')

diff --git a/config-generator/build.gradle b/config-generator/build.gradle
@@ -18,6 +18,8 @@ dependencies {
     implementation             group: 'com.squareup',             name: 'javapoet',           version: ver.'javapoet'
     implementation             group: 'org.jetbrains',            name: 'annotations',        version: ver.'jetbrains-annotations'
 
+    testCompileOnly  group: 'com.google.auto.service',  name: 'auto-service',       version: ver.'auto-service'
+
     testImplementation platform(dep.junit5bom)
     testImplementation project(':core-test-utils')
     testImplementation dep.junit5jupiter

diff --git a/...ults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/BooleanLimit.java b/...ults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/BooleanLimit.java
@@ -65,11 +65,6 @@ protected boolean isViolatedInternal(Object inputValue) {
         return b != value;
     }
 
-    @Override
-    String getValueAsString() {
-        throw new UnsupportedOperationException("TODO");
-    }
-
     @Override
     String asErrorMessage(String key, Object value) {
         return formatWithLocale(

diff --git a/defaults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/DoubleLimit.java b/defaults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/DoubleLimit.java
@@ -37,9 +37,4 @@ protected boolean isViolatedInternal(Object inputValue) {
 
         return d > value;
     }
-
-    @Override
-    String getValueAsString() {
-        throw new UnsupportedOperationException("TODO");
-    }
 }
diff --git a/defaults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/Limit.java b/defaults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/Limit.java
@@ -63,12 +63,6 @@ private void assertTypeCompatible(Object inputValue) {
      */
     protected abstract boolean isViolatedInternal(Object inputValue);
 
-    /**
-     * This is handy for creating error messages
-     */
-    @Deprecated
-    abstract String getValueAsString();
-
     String asErrorMessage(String key, Object value) {
         return formatWithLocale(
             "Configuration parameter '%s' with value '%s' exceeds it's limit of '%s'",

diff --git a/defaults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/LongLimit.java b/defaults-and-limits-configuration/src/main/java/org/neo4j/gds/configuration/LongLimit.java
@@ -37,9 +37,4 @@ public boolean isViolatedInternal(Object inputValue) {
 
         return l > value;
     }
-
-    @Override
-    public String getValueAsString() {
-        return String.valueOf(value);
-    }
 }
diff --git a/defaults-and-limits-configuration/src/test/java/org/neo4j/gds/configuration/LimitTest.java b/defaults-and-limits-configuration/src/test/java/org/neo4j/gds/configuration/LimitTest.java
@@ -37,11 +37,6 @@ Object getValue() {
             protected boolean isViolatedInternal(Object inputValue) {
                 throw new UnsupportedOperationException("TODO");
             }
-
-            @Override
-            String getValueAsString() {
-                throw new UnsupportedOperationException("TODO");
-            }
         };
 
         try {

diff --git a/doc-test-tools/src/main/java/org/neo4j/gds/doc/PartialsIncludeProcessor.java b/doc-test-tools/src/main/java/org/neo4j/gds/doc/PartialsIncludeProcessor.java
@@ -41,7 +41,7 @@ public void process(Document document, PreprocessorReader reader, String target,
         Path partial = resolvePartial(target);
         String partialText = readPartial(partial);
 
-        reader.push_include(partialText, target, null, Integer.MIN_VALUE, Collections.emptyMap());
+        reader.pushInclude(partialText, target, null, Integer.MIN_VALUE, Collections.emptyMap());
     }
 
     @NotNull

diff --git a/native-projection/build.gradle b/native-projection/build.gradle
@@ -13,6 +13,7 @@ dependencies {
     compileOnly group: 'org.immutables', name: 'builder',           version: ver.'immutables'
     compileOnly group: 'org.immutables', name: 'value-annotations', version: ver.'immutables'
     compileOnly group: 'org.jetbrains',  name: 'annotations',       version: ver.'jetbrains-annotations'
+    compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
     neodeps().each {
         compileOnly(group: 'org.neo4j', name: it, version: ver.'neo4j') {

diff --git a/proc/common/src/main/java/org/neo4j/gds/ProcedureAndFunctionScanner.java b/proc/common/src/main/java/org/neo4j/gds/ProcedureAndFunctionScanner.java
@@ -20,7 +20,7 @@
 package org.neo4j.gds;
 
 import org.reflections.Reflections;
-import org.reflections.scanners.MethodAnnotationsScanner;
+import org.reflections.scanners.Scanners;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
@@ -36,7 +36,7 @@ public final class ProcedureAndFunctionScanner {
 
     private static final List<Reflections> reflections = PACKAGES_TO_SCAN
         .stream()
-        .map(pkg -> new Reflections(pkg, new MethodAnnotationsScanner()))
+        .map(pkg -> new Reflections(pkg, Scanners.MethodsAnnotated))
         .collect(Collectors.toList());
 
     private ProcedureAndFunctionScanner() {}

diff --git a/proc/embeddings/build.gradle b/proc/embeddings/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     testAnnotationProcessor project(':annotations')
 
     testCompileOnly group: 'org.immutables', name: 'builder', version: ver.'immutables'
+    testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 
     testImplementation project(':native-projection')
     testImplementation project(':open-model-catalog')

diff --git a/procedures/facade/build.gradle b/procedures/facade/build.gradle
@@ -43,9 +43,12 @@ dependencies {
 
     compileOnly project(':pregel')
 
+    compileOnly group: 'org.immutables', name: 'value', version: ver.'immutables'
     compileOnly group: 'org.jetbrains', name: 'annotations', version: ver.'jetbrains-annotations'
 
     // test infrastructure
+    testCompileOnly group: 'org.immutables', name: 'value', version: ver.'immutables'
+    testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: ver.'junit5bom'
     testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: ver.'junit5bom'
     testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: ver.'junit5bom'

diff --git a/procedures/integration/build.gradle b/procedures/integration/build.gradle
@@ -12,6 +12,8 @@ dependencies {
 
         testImplementation(group: 'org.neo4j', name: it, version: ver.'neo4j')
     }
+    compileOnly project(':annotations')
+    compileOnly group: 'org.immutables', name: 'value', version: ver.'immutables'
 
     implementation project(':config-api')
     implementation project(':core')

diff --git a/test-utils/build.gradle b/test-utils/build.gradle
@@ -53,5 +53,6 @@ dependencies {
     testImplementation project(':edition-api')
     testImplementation project(':graph-schema-api')
 
+    testCompileOnly group: 'org.immutables', name: 'builder', version: ver.'immutables'
     testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
 }