Fix new ErrorProne errors from new EP version, and a few ancient warn…

…ings.
4Science · Sep 18, 2024 · 353cf71 · 353cf71
1 parent fc16a5f
commit 353cf71
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 15 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java b/dspace-api/src/main/java/org/dspace/authenticate/LDAPAuthentication.java
@@ -503,6 +503,7 @@ protected String getDNOfUser(String adminUser, String adminPassword, Context con
                     } else {
                         searchName = ldap_provider_url + ldap_search_context;
                     }
+                    @SuppressWarnings("BanJNDI")
                     NamingEnumeration<SearchResult> answer = ctx.search(
                         searchName,
                         "(&({0}={1}))", new Object[] {ldap_id_field,
@@ -553,7 +554,7 @@ protected String getDNOfUser(String adminUser, String adminPassword, Context con
                             att = atts.get(attlist[4]);
                             if (att != null) {
                                 // loop through all groups returned by LDAP
-                                ldapGroup = new ArrayList<String>();
+                                ldapGroup = new ArrayList<>();
                                 for (NamingEnumeration val = att.getAll(); val.hasMoreElements(); )  {
                                     ldapGroup.add((String) val.next());
                                 }
@@ -633,7 +634,8 @@ protected boolean ldapAuthenticate(String netid, String password,
                         ctx.addToEnvironment(javax.naming.Context.AUTHORITATIVE, "true");
                         ctx.addToEnvironment(javax.naming.Context.REFERRAL, "follow");
                         // dummy operation to check if authentication has succeeded
-                        ctx.getAttributes("");
+                        @SuppressWarnings("BanJNDI")
+                        Attributes trash = ctx.getAttributes("");
                     } else if (!useTLS) {
                         // Authenticate
                         env.put(javax.naming.Context.SECURITY_AUTHENTICATION, "Simple");

diff --git a/dspace-api/src/main/java/org/dspace/curate/Curation.java b/dspace-api/src/main/java/org/dspace/curate/Curation.java
@@ -165,7 +165,7 @@ private long runQueue(TaskQueue queue, Curator curator) throws SQLException, Aut
      * End of curation script; logs script time if -v verbose is set
      *
      * @param timeRun Time script was started
-     * @throws SQLException If DSpace contextx can't complete
+     * @throws SQLException If DSpace context can't complete
      */
     private void endScript(long timeRun) throws SQLException {
         context.complete();
@@ -300,9 +300,17 @@ private void initGeneralLineOptionsAndCheckIfValid() {
         // scope
         if (this.commandLine.getOptionValue('s') != null) {
             this.scope = this.commandLine.getOptionValue('s');
-            if (this.scope != null && Curator.TxScope.valueOf(this.scope.toUpperCase()) == null) {
-                this.handler.logError("Bad transaction scope '" + this.scope + "': only 'object', 'curation' or " +
-                                      "'open' recognized");
+            boolean knownScope;
+            try {
+                Curator.TxScope.valueOf(this.scope.toUpperCase());
+                knownScope = true;
+            } catch (IllegalArgumentException | NullPointerException e) {
+                knownScope = false;
+            }
+            if (!knownScope) {
+                this.handler.logError("Bad transaction scope '"
+                        + this.scope
+                        + "': only 'object', 'curation' or 'open' recognized");
                 throw new IllegalArgumentException(
                     "Bad transaction scope '" + this.scope + "': only 'object', 'curation' or " +
                     "'open' recognized");

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
@@ -50,17 +50,12 @@ public abstract class DSpaceRestRepository<T extends RestAddressableModel, ID ex
     extends AbstractDSpaceRestRepository
     implements CrudRepository<T, ID>, PagingAndSortingRepository<T, ID>, BeanNameAware {
 
-    private static final Logger log = org.apache.logging.log4j.LogManager.getLogger(DSpaceRestRepository.class);
-
     private String thisRepositoryBeanName;
     private DSpaceRestRepository<T, ID> thisRepository;
 
     @Autowired
     private ApplicationContext applicationContext;
 
-    @Autowired
-    private MetadataFieldService metadataFieldService;
-
     /**
      * From BeanNameAware. Allows us to capture the name of the bean, so we can load it into thisRepository.
      * See getThisRepository() method.

diff --git a/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceKernelInitializer.java b/dspace-server-webapp/src/main/java/org/dspace/app/rest/utils/DSpaceKernelInitializer.java
@@ -81,6 +81,7 @@ public void initialize(final ConfigurableApplicationContext applicationContext)
      * Initially look for JNDI Resource called "java:/comp/env/dspace.dir".
      * If not found, use value provided in "dspace.dir" in Spring Environment
      */
+    @SuppressWarnings("BanJNDI")
     private String getDSpaceHome(ConfigurableEnvironment environment) {
         // Load the "dspace.dir" property from Spring Boot's Configuration (application.properties)
         // This gives us the location of our DSpace configurations, necessary to start the kernel

diff --git a/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java b/dspace-services/src/main/java/org/dspace/services/email/EmailServiceImpl.java
@@ -62,6 +62,7 @@ public Session getSession() {
     }
 
     @PostConstruct
+    @SuppressWarnings("BanJNDI")
     public void init() {
         // See if there is already a Session in our environment
         String sessionName = cfg.getProperty("mail.session.name");

diff --git a/dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java b/dspace/modules/server/src/main/java/org/dspace/app/ServerApplication.java
@@ -23,7 +23,7 @@
  * NOTE: This extends SpringBootServletInitializer in order to allow us to build
  * a deployable WAR file with Spring Boot. See:
  * http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
- * 
+ *
  * @author Luca Giamminonni (luca.giamminonni at 4science.it)
  *
  */
@@ -39,8 +39,8 @@ public class ServerApplication extends SpringBootServletInitializer {
      * <p>
      * See: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#howto-create-a-deployable-war-file
      *
-     * @param application
-     * @return
+     * @param application some builder.
+     * @return the builder, configured with DSpace sources and initializers.
      */
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {

diff --git a/pom.xml b/pom.xml
@@ -29,7 +29,7 @@
         <solr.client.version>8.11.3</solr.client.version>
 
         <ehcache.version>3.10.8</ehcache.version>
-        <errorprone.version>2.10.0</errorprone.version>
+        <errorprone.version>2.32.0</errorprone.version>
         <!-- NOTE: when updating jackson.version, also sync jackson-databind.version below -->
         <jackson.version>2.16.0</jackson.version>
         <jackson-databind.version>2.16.0</jackson-databind.version>