Skip to content

Commit cb354ae

Browse files
authored
Merge pull request #8556 from vnickolov/remove-spotbugs-2.5
Remove SpotBugs
2 parents 7982a2e + 758ada7 commit cb354ae

File tree

71 files changed

+4
-878
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+4
-878
lines changed

algo-common/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ dependencies {
1111

1212
compileOnly group: 'org.jetbrains', name: 'annotations', version: ver.'jetbrains-annotations'
1313
compileOnly group: 'org.immutables', name: 'value-annotations', version: ver.'immutables'
14-
compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
1514
neodeps().each {
1615
compileOnly(group: 'org.neo4j', name: it, version: ver.'neo4j') {
1716
transitive = false
@@ -31,7 +30,6 @@ dependencies {
3130

3231
implementation group: 'org.hdrhistogram', name: 'HdrHistogram', version: ver.'HdrHistogram'
3332

34-
testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
3533
testImplementation project(':test-utils')
3634
testImplementation project(':graph-schema-api')
3735
}

algo-test/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ dependencies {
1414
compileOnly group: 'org.immutables', name: 'value-annotations', version: ver.'immutables'
1515
compileOnly group: 'org.immutables', name: 'builder', version: ver.'immutables'
1616
compileOnly group: 'org.jetbrains', name: 'annotations', version: ver.'jetbrains-annotations'
17-
compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
18-
1917

2018
neodeps().each {
2119
compileOnly(group: 'org.neo4j', name: it, version: ver.'neo4j') {

algo/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ dependencies {
1414
compileOnly group: 'org.immutables', name: 'value-annotations', version: ver.'immutables'
1515
compileOnly group: 'org.immutables', name: 'builder', version: ver.'immutables'
1616
compileOnly group: 'org.jetbrains', name: 'annotations', version: ver.'jetbrains-annotations'
17-
compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
1817

1918
implementation group: 'org.apache.commons', name: 'commons-math3', version: ver.'commons-math3'
2019

@@ -52,8 +51,6 @@ dependencies {
5251
testAnnotationProcessor project(':annotations')
5352
testAnnotationProcessor project(':config-generator')
5453

55-
testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
56-
5754
testImplementation project(':edition-api')
5855
testImplementation project(':test-utils')
5956
testImplementation project(':ml-test-utils')

algo/src/main/java/org/neo4j/gds/scaleproperties/ScaleProperties.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@
1919
*/
2020
package org.neo4j.gds.scaleproperties;
2121

22+
import org.jetbrains.annotations.Nullable;
2223
import org.neo4j.gds.Algorithm;
2324
import org.neo4j.gds.annotation.ValueClass;
2425
import org.neo4j.gds.api.Graph;
2526
import org.neo4j.gds.api.IdMap;
2627
import org.neo4j.gds.api.properties.nodes.DoubleNodePropertyValues;
2728
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
28-
import org.neo4j.gds.core.concurrency.RunWithConcurrency;
2929
import org.neo4j.gds.collections.ha.HugeObjectArray;
30+
import org.neo4j.gds.core.concurrency.RunWithConcurrency;
3031
import org.neo4j.gds.core.utils.partition.PartitionUtils;
3132
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3233
import org.neo4j.gds.scaling.ScalarScaler;
3334
import org.neo4j.gds.scaling.Scaler;
3435

35-
import javax.annotation.Nullable;
3636
import java.util.List;
3737
import java.util.Map;
3838
import java.util.Optional;

algo/src/test/java/org/neo4j/gds/embeddings/graphsage/GraphSageModelTrainerTest.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
package org.neo4j.gds.embeddings.graphsage;
2121

22-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2322
import org.assertj.core.data.Offset;
2423
import org.assertj.core.util.DoubleComparator;
2524
import org.junit.jupiter.api.BeforeEach;
@@ -34,8 +33,8 @@
3433
import org.neo4j.gds.beta.generator.PropertyProducer;
3534
import org.neo4j.gds.beta.generator.RandomGraphGenerator;
3635
import org.neo4j.gds.beta.generator.RelationshipDistribution;
37-
import org.neo4j.gds.core.concurrency.DefaultPool;
3836
import org.neo4j.gds.collections.ha.HugeObjectArray;
37+
import org.neo4j.gds.core.concurrency.DefaultPool;
3938
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
4039
import org.neo4j.gds.embeddings.graphsage.algo.GraphSageTrainConfigImpl;
4140
import org.neo4j.gds.extension.GdlExtension;
@@ -60,11 +59,9 @@ class GraphSageModelTrainerTest {
6059
private final int FEATURES_COUNT = 5;
6160
private final int EMBEDDING_DIMENSION = 64;
6261

63-
@SuppressFBWarnings("HSC_HUGE_SHARED_STRING_CONSTANT")
6462
@GdlGraph
6563
private static final String GDL = GraphSageTestGraph.GDL;
6664

67-
@SuppressFBWarnings
6865
@GdlGraph(orientation = Orientation.UNDIRECTED, graphNamePrefix = "array")
6966
private static final String ARRAY_GRAPH = "CREATE" +
7067
" (a { features: [-1.0, 2.1] })" +

algo/src/test/java/org/neo4j/gds/embeddings/graphsage/algo/GraphSageTrainAlgorithmFactoryTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
package org.neo4j.gds.embeddings.graphsage.algo;
2121

22-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2322
import org.eclipse.collections.api.tuple.primitive.IntObjectPair;
2423
import org.eclipse.collections.api.tuple.primitive.LongLongPair;
2524
import org.eclipse.collections.impl.tuple.Tuples;
@@ -74,7 +73,6 @@ class GraphSageTrainAlgorithmFactoryTest {
7473

7574
private static final int SOME_REASONABLE_VALUE = 100;
7675

77-
@SuppressFBWarnings("HSC_HUGE_SHARED_STRING_CONSTANT")
7876
@GdlGraph
7977
private static final String GDL = GraphSageTestGraph.GDL;
8078

algo/src/test/java/org/neo4j/gds/leiden/FootballTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
package org.neo4j.gds.leiden;
2121

22-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2322
import org.assertj.core.data.Offset;
2423
import org.junit.jupiter.params.ParameterizedTest;
2524
import org.junit.jupiter.params.provider.ValueSource;
@@ -40,7 +39,6 @@
4039
@GdlExtension
4140
class FootballTest {
4241

43-
@SuppressFBWarnings("HSC_HUGE_SHARED_STRING_CONSTANT")
4442
@GdlGraph(orientation = Orientation.UNDIRECTED)
4543
public static final String GRAPH = TestGraphs.FOOTBALL_GRAPH;
4644

algo/src/test/java/org/neo4j/gds/leiden/LocalMovePhaseKarateTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
*/
2020
package org.neo4j.gds.leiden;
2121

22-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2322
import org.junit.jupiter.api.Test;
2423
import org.neo4j.gds.Orientation;
2524
import org.neo4j.gds.collections.ha.HugeDoubleArray;
@@ -37,7 +36,6 @@
3736
@GdlExtension
3837
class LocalMovePhaseKarateTest {
3938

40-
@SuppressFBWarnings("HSC_HUGE_SHARED_STRING_CONSTANT")
4139
@GdlGraph(orientation = Orientation.UNDIRECTED)
4240
private static final String DB_CYPHER = TestGraphs.KARATE_CLUB_GRAPH;
4341

alpha/alpha-proc/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ dependencies {
1616

1717
compileOnly group: 'org.immutables', name: 'value-annotations', version: ver.'immutables'
1818
compileOnly group: 'org.jetbrains', name: 'annotations', version: ver.'jetbrains-annotations'
19-
compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
2019
neodeps().each {
2120
compileOnly(group: 'org.neo4j', name: it, version: ver.'neo4j') {
2221
transitive = false
@@ -46,7 +45,6 @@ dependencies {
4645
testCompileOnly group: 'org.immutables', name: 'value-annotations', version: ver.'immutables'
4746
testCompileOnly group: 'org.immutables', name: 'builder', version: ver.'immutables'
4847
testCompileOnly group: 'org.jetbrains', name: 'annotations', version: ver.'jetbrains-annotations'
49-
testCompileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: ver.'spotbugsToolVersion'
5048

5149
testImplementation project(':test-utils')
5250
testImplementation project(':proc-test')

build.gradle

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ plugins {
33
id 'com.github.johnrengelman.shadow' version '8.1.0' apply false
44
id 'ch.kk7.spawn' version '1.0.20180924200750' apply false
55
id 'de.thetaphi.forbiddenapis' version '3.4' apply false
6-
id 'com.github.spotbugs' version '5.0.13' apply false
76
id 'nebula.info-dependencies' version '11.4.1' apply false
87
id 'com.google.protobuf' version '0.9.4' apply false
98
id 'me.champeau.mrjar' version "0.1" apply false
@@ -21,9 +20,6 @@ ext {
2120

2221
checkstyleReportsDir = "${buildDir}/reports/checkstyle/"
2322

24-
spotbugsReportsDir = "${buildDir}/reports/spotbugs/"
25-
SpotBugsTask = com.github.spotbugs.snom.SpotBugsTask
26-
2723
compatibilityModules = [
2824
'kernel-adapter': [
2925
project(':neo4j-kernel-adapter-4.4'),
@@ -75,16 +71,11 @@ allprojects {
7571
description = "Run all checkstyle related tasks"
7672
}
7773

78-
tasks.register("spotbugs") {
79-
group = "verification"
80-
description = "Run all spotbugs related tasks"
81-
}
8274
}
8375

8476
apply from: 'gradle/dependencies.gradle'
8577
apply from: 'gradle/defaults-java.gradle'
8678
apply from: 'gradle/forbidden-apis.gradle'
8779
apply from: 'gradle/checkstyle.gradle'
88-
apply from: 'gradle/spotbugs.gradle'
8980
apply from: 'gradle/spotless.gradle'
9081
apply from: 'gradle/pregel-bootstrap.gradle'

0 commit comments

Comments
 (0)