chore: suppress new spotbug issues

reficio · Nov 17, 2022 · 4b38a8a · 4b38a8a
1 parent 3a7ba37
commit 4b38a8a
Show file tree

Hide file tree

Showing 17 changed files with 37 additions and 10 deletions.
diff --git a/src/main/groovy/org/reficio/p2/resolver/eclipse/impl/DefaultEclipseResolver.groovy b/src/main/groovy/org/reficio/p2/resolver/eclipse/impl/DefaultEclipseResolver.groovy
@@ -25,7 +25,7 @@ import org.reficio.p2.resolver.eclipse.EclipseResolutionRequest
 import org.reficio.p2.resolver.eclipse.EclipseResolutionResponse
 import org.reficio.p2.resolver.eclipse.EclipseResolver
 
-@SuppressFBWarnings("SE_NO_SERIALVERSIONID")
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP", "SE_NO_SERIALVERSIONID"])
 class DefaultEclipseResolver implements EclipseResolver {
 
     final File target

diff --git a/src/main/groovy/org/reficio/p2/resolver/eclipse/impl/FileBinaryCategory.groovy b/src/main/groovy/org/reficio/p2/resolver/eclipse/impl/FileBinaryCategory.groovy
@@ -20,7 +20,7 @@ package org.reficio.p2.resolver.eclipse.impl
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-@SuppressFBWarnings("SE_NO_SERIALVERSIONID")
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP", "EI_EXPOSE_REP2" , "SE_NO_SERIALVERSIONID"])
 class FileBinaryCategory {
     def static leftShift(File file, URL url) {
         url.withInputStream { is ->

diff --git a/src/main/groovy/org/reficio/p2/resolver/maven/impl/Aether.groovy b/src/main/groovy/org/reficio/p2/resolver/maven/impl/Aether.groovy
@@ -18,6 +18,7 @@
  */
 package org.reficio.p2.resolver.maven.impl
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
 import org.reficio.p2.resolver.maven.impl.facade.AetherEclipseFacade
 import org.reficio.p2.resolver.maven.impl.facade.AetherFacade
 import org.reficio.p2.resolver.maven.impl.facade.AetherSonatypeFacade
@@ -28,6 +29,7 @@ import org.reficio.p2.resolver.maven.impl.facade.AetherSonatypeFacade
  *         http://www.reficio.org
  * @since 1.1.0
  */
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP", "EI_EXPOSE_REP2"])
 class Aether {
 
     static AetherFacade facade(def repositorySystemSession) {

diff --git a/src/main/groovy/org/reficio/p2/resolver/maven/impl/AetherResolver.groovy b/src/main/groovy/org/reficio/p2/resolver/maven/impl/AetherResolver.groovy
@@ -34,7 +34,7 @@ import org.reficio.p2.resolver.maven.ResolvedArtifact
  *         http://www.reficio.org
  * @since 1.0.0
  */
-@SuppressFBWarnings("SE_NO_SERIALVERSIONID")
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP", "SE_NO_SERIALVERSIONID"])
 class AetherResolver implements ArtifactResolver {
 
     static final String DEFAULT_SCOPE = "compile"

diff --git a/src/main/groovy/org/reficio/p2/resolver/maven/impl/facade/AetherEclipseFacade.groovy b/src/main/groovy/org/reficio/p2/resolver/maven/impl/facade/AetherEclipseFacade.groovy
@@ -39,7 +39,7 @@ import org.reficio.p2.resolver.maven.Artifact
  *         http://www.reficio.org
  * @since 1.1.0
  */
-@SuppressFBWarnings("SE_NO_SERIALVERSIONID")
+@SuppressFBWarnings(value = [ "EI_EXPOSE_REP2" , "EI_EXPOSE_REP" , "SE_NO_SERIALVERSIONID" ])
 class AetherEclipseFacade implements AetherFacade {
 
     @Override

diff --git a/src/main/groovy/org/reficio/p2/resolver/maven/impl/facade/AetherSonatypeFacade.groovy b/src/main/groovy/org/reficio/p2/resolver/maven/impl/facade/AetherSonatypeFacade.groovy
@@ -39,7 +39,7 @@ import org.sonatype.aether.util.graph.PreorderNodeListGenerator
  *         http://www.reficio.org
  * @since 1.1.0
  */
-@SuppressFBWarnings("SE_NO_SERIALVERSIONID")
+@SuppressFBWarnings(value = ["EI_EXPOSE_REP2" , "EI_EXPOSE_REP" , "SE_NO_SERIALVERSIONID" ])
 class AetherSonatypeFacade implements AetherFacade {
 
     @Override

diff --git a/src/main/java/org/reficio/p2/FeatureBuilder.java b/src/main/java/org/reficio/p2/FeatureBuilder.java
@@ -38,6 +38,7 @@
 public class FeatureBuilder {
 
 
+	@SuppressFBWarnings("EI_EXPOSE_REP2")
 	public FeatureBuilder(P2FeatureDefinition p2FeatureDefintion,
 						  final P2ArtifactMap<ArtifactBundlerInstructions> bundlerInstructions,
 						  boolean generateSourceFeature,

diff --git a/src/main/java/org/reficio/p2/P2Artifact.java b/src/main/java/org/reficio/p2/P2Artifact.java
@@ -18,7 +18,10 @@
  */
 package org.reficio.p2;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,6 +36,7 @@
  *         http://www.reficio.org
  * @since 1.0.0
  */
+@SuppressFBWarnings({"EI_EXPOSE_REP2", "EI_EXPOSE_REP"})
 public class P2Artifact {
 
     /**

diff --git a/src/main/java/org/reficio/p2/P2FeatureDefinition.java b/src/main/java/org/reficio/p2/P2FeatureDefinition.java
@@ -18,6 +18,8 @@
  */
 package org.reficio.p2;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -31,6 +33,7 @@
  *         http://www.itemis.de
  * @since 1.1.2
  */
+@SuppressFBWarnings(value = "EI_EXPOSE_REP")
 public class P2FeatureDefinition  {
 
 	public P2FeatureDefinition() {

diff --git a/src/main/java/org/reficio/p2/TychoFeatureBuilder.java b/src/main/java/org/reficio/p2/TychoFeatureBuilder.java
@@ -31,6 +31,8 @@
 
 import java.io.File;
 import java.io.IOException;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -39,6 +41,7 @@
 import org.eclipse.tycho.core.osgitools.targetplatform.DefaultDependencyArtifacts;
 import org.reficio.p2.utils.Utils;
 
+@SuppressFBWarnings(value = "EI_EXPOSE_REP")
 public class TychoFeatureBuilder {
 
     File featureFile;

diff --git a/src/main/java/org/reficio/p2/bundler/ArtifactBundlerInstructions.java b/src/main/java/org/reficio/p2/bundler/ArtifactBundlerInstructions.java
@@ -19,6 +19,8 @@
 package org.reficio.p2.bundler;
 
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -29,6 +31,7 @@
  *         http://www.reficio.org
  * @since 1.1.0
  */
+@SuppressFBWarnings(value = "EI_EXPOSE_REP")
 public final class ArtifactBundlerInstructions {
 
     /**

diff --git a/src/main/java/org/reficio/p2/publisher/BundlePublisher.java b/src/main/java/org/reficio/p2/publisher/BundlePublisher.java
@@ -18,6 +18,7 @@
  */
 package org.reficio.p2.publisher;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.BuildPluginManager;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -35,6 +36,7 @@
  *         http://www.reficio.org
  * @since 1.0.0
  */
+@SuppressFBWarnings(value = "EI_EXPOSE_REP2")
 public class BundlePublisher {
 
     private final Boolean compressSite;

diff --git a/src/main/java/org/reficio/p2/publisher/CategoryPublisher.java b/src/main/java/org/reficio/p2/publisher/CategoryPublisher.java
@@ -36,6 +36,7 @@
  *         http://www.reficio.org
  * @since 1.0.0
  */
+@SuppressFBWarnings("EI_EXPOSE_REP2")
 public class CategoryPublisher {
 
     private static final String CATEGORY_PUBLISHER_APP_NAME = "org.eclipse.equinox.p2.publisher.CategoryPublisher";
@@ -46,7 +47,6 @@ public class CategoryPublisher {
     private final String categoryFileLocation;
     private final String metadataRepositoryLocation;
 
-    @SuppressFBWarnings("EI_EXPOSE_REP2")
     public CategoryPublisher(P2ApplicationLauncher launcher, int forkedProcessTimeoutInSeconds, String[] additionalArgs,
                              String categoryFileLocation, String metadataRepositoryLocation) {
         this.launcher = launcher;

diff --git a/src/main/java/org/reficio/p2/resolver/eclipse/EclipseResolutionResponse.java b/src/main/java/org/reficio/p2/resolver/eclipse/EclipseResolutionResponse.java
@@ -18,7 +18,10 @@
  */
 package org.reficio.p2.resolver.eclipse;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
 import java.io.File;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -27,12 +30,13 @@
  *         http://www.reficio.org
  * @since 1.1.2
  */
+@SuppressFBWarnings(value = {"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
 public class EclipseResolutionResponse {
 
     private final List<File> resolved;
 
     public EclipseResolutionResponse(List<File> resolved) {
-        this.resolved = resolved;
+        this.resolved = Collections.unmodifiableList(resolved);
     }
 
     public List<File> getResolved() {

diff --git a/src/main/java/org/reficio/p2/resolver/maven/ArtifactResolutionRequest.java b/src/main/java/org/reficio/p2/resolver/maven/ArtifactResolutionRequest.java
@@ -19,6 +19,7 @@
 package org.reficio.p2.resolver.maven;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -47,7 +48,7 @@ public String getRootArtifactId() {
     }
 
     public List<String> getExcludes() {
-        return excludes;
+        return Collections.unmodifiableList(excludes);
     }
 
     public boolean isResolveTransitive() {

diff --git a/src/test/java/org/reficio/p2/bundler/impl/AquteBundlerTest.java b/src/test/java/org/reficio/p2/bundler/impl/AquteBundlerTest.java
@@ -19,6 +19,7 @@
 package org.reficio.p2.bundler.impl;
 
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.maven.plugin.logging.SystemStreamLog;
 import org.assertj.core.api.ThrowableAssert;
 import org.junit.AfterClass;
@@ -37,6 +38,7 @@
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.mockStatic;
 
+@SuppressFBWarnings("RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE")
 public class AquteBundlerTest {
 
 

diff --git a/src/test/java/org/reficio/p2/resolver/impl/AetherTest.java b/src/test/java/org/reficio/p2/resolver/impl/AetherTest.java
@@ -18,12 +18,14 @@
  */
 package org.reficio.p2.resolver.impl;
 
+import org.hamcrest.core.IsInstanceOf;
 import org.junit.Test;
 import org.reficio.p2.resolver.maven.impl.Aether;
 import org.reficio.p2.resolver.maven.impl.facade.AetherEclipseFacade;
 import org.reficio.p2.resolver.maven.impl.facade.AetherFacade;
 import org.reficio.p2.resolver.maven.impl.facade.AetherSonatypeFacade;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.Mockito.mock;
 
@@ -44,7 +46,7 @@ public void facade_sonatypeAetherSystem() {
         AetherFacade facade = Aether.facade(repositorySystem);
 
         // THEN
-        assertTrue("Wrong facade type", facade instanceof AetherSonatypeFacade);
+        assertThat(facade).isInstanceOf(AetherSonatypeFacade.class);
     }
 
     @Test
@@ -56,7 +58,7 @@ public void facade_eclipseAetherSystem() {
         AetherFacade facade = Aether.facade(repositorySystem);
 
         // THEN
-        assertTrue("Wrong facade type", facade instanceof AetherEclipseFacade);
+        assertThat(facade).isInstanceOf(AetherEclipseFacade.class);
     }
 
 }