From 6d64d27fe4ad26bee7ffd10a852e71240f8ae903 Mon Sep 17 00:00:00 2001
From: Graham Triggs <graham.triggs@tib.eu>
Date: Thu, 23 Jan 2020 18:12:03 +0000
Subject: [PATCH] [VIVO-1737] Update Error Prone (#131)

Resolves: https://jira.lyrasis.org/browse/VIVO-1737
---
 .../vitro/webapp/beans/IndividualImpl.java    |  1 +
 .../grefine/JSONReconcileServlet.java         |  4 +--
 .../controller/AutocompleteController.java    |  4 +--
 pom.xml                                       | 36 ++++++++++++++-----
 4 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
index 5ce3509e8..e70a344fb 100755
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/beans/IndividualImpl.java
@@ -20,6 +20,7 @@ import edu.cornell.mannlib.vitro.webapp.filestorage.model.ImageInfo;
 /**
  * Represents a single entity record.
 */
+@SuppressWarnings("ComparableType")
 public class IndividualImpl extends BaseResourceBean implements Individual, Comparable<Individual> {
 	/**
 	 * This can be used as a "not initialized" indicator for a property that
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
index 179c4750d..4f0183606 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/controller/grefine/JSONReconcileServlet.java
@@ -469,7 +469,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
         return queryStr.replaceAll("\\s+", "\\\\ ");
     }
 
-    public class SearchResult implements Comparable<Object> {
+    public class SearchResult implements Comparable<SearchResult> {
         private String label;
         private String uri;
 
@@ -493,7 +493,7 @@ public class JSONReconcileServlet extends VitroHttpServlet {
             return map;
         }
 
-        public int compareTo(Object o) throws ClassCastException {
+        public int compareTo(SearchResult o) throws ClassCastException {
             if ( !(o instanceof SearchResult) ) {
                 throw new ClassCastException("Error in SearchResult.compareTo(): expected SearchResult object.");
             }
diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
index dfc332328..ab16e2518 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/search/controller/AutocompleteController.java
@@ -311,7 +311,7 @@ public class AutocompleteController extends VitroAjaxController {
 		return RDFServiceUtils.getRDFService(new VitroRequest(req));
 	}
 
-    public class SearchResult implements Comparable<Object> {
+    public class SearchResult implements Comparable<SearchResult> {
         private String label;
         private String uri;
         private String msType;
@@ -375,7 +375,7 @@ public class AutocompleteController extends VitroAjaxController {
         	return jsonObj;
         }
 
-        public int compareTo(Object o) throws ClassCastException {
+        public int compareTo(SearchResult o) throws ClassCastException {
             if ( !(o instanceof SearchResult) ) {
                 throw new ClassCastException("Error in SearchResult.compareTo(): expected SearchResult object.");
             }
diff --git a/pom.xml b/pom.xml
index 9759cc276..dac2c0532 100644
--- a/pom.xml
+++ b/pom.xml
@@ -217,6 +217,34 @@
                 </plugins>
             </build>
         </profile>
+        <profile>
+            <!-- Profile for Error Prone plugin -->
+            <id>errorprone</id>
+            <activation>
+                <jdk>[1.8,12)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <fork>true</fork>
+                            <compilerArgs combine.children="append">
+                                <arg>-Xplugin:ErrorProne</arg>
+                            </compilerArgs>
+                            <annotationProcessorPaths>
+                                <path>
+                                    <groupId>com.google.errorprone</groupId>
+                                    <artifactId>error_prone_core</artifactId>
+                                    <version>2.3.4</version>
+                                </path>
+                            </annotationProcessorPaths>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>
@@ -230,15 +258,7 @@
                     <encoding>UTF-8</encoding>
                     <compilerArgs>
                         <arg>-XDcompilePolicy=simple</arg>
-                        <arg>-Xplugin:ErrorProne</arg>
                     </compilerArgs>
-                    <annotationProcessorPaths>
-                        <path>
-                            <groupId>com.google.errorprone</groupId>
-                            <artifactId>error_prone_core</artifactId>
-                            <version>2.3.2</version>
-                        </path>
-                    </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>