chore(pom.xml): Purge findbugs annotations from the code

sidohaakma · Dec 4, 2018 · e2a6d19 · e2a6d19
1 parent 516b05c
commit e2a6d19
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 47 deletions.
diff --git a/molgenis-data-cache/pom.xml b/molgenis-data-cache/pom.xml
@@ -18,11 +18,6 @@
       <version>${project.version}</version>
     </dependency>
     <!-- third party dependencies -->
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>findbugs-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>
       <artifactId>jsr305</artifactId>

diff --git a/molgenis-data-icd10/pom.xml b/molgenis-data-icd10/pom.xml
@@ -37,11 +37,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>findbugs-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <!-- test dependencies -->
     <dependency>
       <groupId>org.molgenis</groupId>

diff --git a/molgenis-data/pom.xml b/molgenis-data/pom.xml
@@ -53,11 +53,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-tx</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>findbugs-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.auto.value</groupId>
       <artifactId>auto-value</artifactId>

diff --git a/molgenis-data/src/main/java/org/molgenis/data/DataConverter.java b/molgenis-data/src/main/java/org/molgenis/data/DataConverter.java
@@ -3,7 +3,6 @@
 import static java.util.Collections.singletonList;
 import static java.util.stream.StreamSupport.stream;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.ArrayList;
@@ -20,9 +19,6 @@
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.support.DefaultConversionService;
 
-@SuppressFBWarnings(
-    value = "NP_BOOLEAN_RETURN_NULL",
-    justification = "We want to return Boolean.TRUE, Boolean.FALSE or null")
 public class DataConverter {
   private static ConversionService conversionService;
 

diff --git a/molgenis-i18n/pom.xml b/molgenis-i18n/pom.xml
@@ -59,10 +59,5 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>findbugs-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/molgenis-util/pom.xml b/molgenis-util/pom.xml
@@ -18,11 +18,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>findbugs-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>com.sun.mail</groupId>
       <artifactId>javax.mail</artifactId>

diff --git a/molgenis-util/src/main/java/org/molgenis/util/ApplicationContextProvider.java b/molgenis-util/src/main/java/org/molgenis/util/ApplicationContextProvider.java
@@ -1,6 +1,5 @@
 package org.molgenis.util;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
@@ -9,9 +8,8 @@
  *
  * @author erwin
  */
-@SuppressFBWarnings(
-    value = "ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD",
-    justification = "Intented static write from instance")
+// Intended static write from instance
+@SuppressWarnings("squid:S2696")
 public class ApplicationContextProvider implements ApplicationContextAware {
   private static ApplicationContext ctx = null;
 

diff --git a/molgenis-validation/pom.xml b/molgenis-validation/pom.xml
@@ -23,11 +23,6 @@
       <groupId>org.springframework</groupId>
       <artifactId>spring-context-support</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>findbugs-annotations</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.everit.json</groupId>
       <artifactId>org.everit.json.schema</artifactId>

diff --git a/molgenis-validation/src/main/java/org/molgenis/validation/JsonValidationException.java b/molgenis-validation/src/main/java/org/molgenis/validation/JsonValidationException.java
@@ -2,8 +2,7 @@
 
 import static java.lang.String.format;
 import static java.util.Objects.requireNonNull;
-import static java.util.stream.Collectors.toList;
-import static org.apache.commons.lang3.StringUtils.join;
+import static java.util.stream.Collectors.joining;
 
 import java.util.Set;
 import org.molgenis.i18n.CodedRuntimeException;
@@ -37,6 +36,6 @@ protected Object[] getLocalizedMessageArguments() {
 
   private String getViolationMessages() {
     if ((violations == null) || (violations.isEmpty())) return "Unknown validation exception.";
-    return join(violations.stream().map(ConstraintViolation::getMessage).collect(toList()), '.');
+    return violations.stream().map(ConstraintViolation::getMessage).collect(joining("."));
   }
 }
diff --git a/pom.xml b/pom.xml
@@ -84,7 +84,6 @@
     <!-- dependency versions not managed by parent pom -->
     <google.auto-value.version>1.4.1</google.auto-value.version>
     <apache.rdf4j.version>2.0.2</apache.rdf4j.version>
-    <findbugs-annotations.version>3.0.1</findbugs-annotations.version>
     <google-api-client.version>1.21.0</google-api-client.version>
     <aerogear-otp-java.version>1.0.0</aerogear-otp-java.version>
     <aws-java-sdk-s3.version>1.11.86</aws-java-sdk-s3.version>
@@ -812,11 +811,6 @@
         <artifactId>auto-value</artifactId>
         <version>${google.auto-value.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>findbugs-annotations</artifactId>
-        <version>${findbugs-annotations.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.elasticsearch.client</groupId>
         <artifactId>transport</artifactId>