Replace Java 9 deprecated calls with appropriate substitutes (#1840)

Author: ahornace

src/org/opensolaris/opengrok/analysis/AnalyzerGuru.java

@@ -31,6 +31,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.io.Writer;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
@@ -512,16 +513,18 @@ public static Genre getGenre(FileAnalyzerFactory factory) {
      * FileAnalyzerFactory}
      * @throws IllegalAccessException if the constructor cannot be accessed
      * @throws InstantiationException if the class cannot be instantiated
+     * @throws NoSuchMethodException if no-argument constructor could not be found
+     * @throws InvocationTargetException if the underlying constructor throws an exception
      */
     public static FileAnalyzerFactory findFactory(String factoryClassName)
-            throws ClassNotFoundException, IllegalAccessException,
-            InstantiationException {
-        Class fcn = null;
+            throws ClassNotFoundException, IllegalAccessException, InstantiationException, NoSuchMethodException, 
+            InvocationTargetException {
+        Class<?> fcn = null;
         try {
             fcn = Class.forName(factoryClassName);
 
         } catch (ClassNotFoundException e) {
-            fcn  = getFactoryClass(factoryClassName);
+            fcn = getFactoryClass(factoryClassName);
 
             if (fcn == null) {
                 throw new ClassNotFoundException("Unable to locate class " + factoryClassName);
@@ -540,9 +543,8 @@ public static FileAnalyzerFactory findFactory(String factoryClassName)
      * 
      * @return the analyzer factory class, or null when not found.
      */
-    public static Class getFactoryClass(String simpleName) {
-        //return new AnalyzerGuru().getClass().getPackage().getName();
-        Class factoryClass = null;
+    public static Class<?> getFactoryClass(String simpleName) {
+        Class<?> factoryClass = null;
 
         // Build analysis package name list first time only
         if (analysisPkgNames.isEmpty()) {
@@ -593,16 +595,17 @@ public static Class getFactoryClass(String simpleName) {
      * FileAnalyzerFactory}
      * @throws IllegalAccessException if the constructor cannot be accessed
      * @throws InstantiationException if the class cannot be instantiated
+     * @throws NoSuchMethodException if no-argument constructor could not be found
+     * @throws InvocationTargetException if the underlying constructor throws an exception
      */
     private static FileAnalyzerFactory findFactory(Class<?> factoryClass)
-            throws InstantiationException, IllegalAccessException {
+            throws InstantiationException, IllegalAccessException, NoSuchMethodException, InvocationTargetException {
         for (FileAnalyzerFactory f : factories) {
             if (f.getClass() == factoryClass) {
                 return f;
             }
         }
-        FileAnalyzerFactory f
-                = (FileAnalyzerFactory) factoryClass.newInstance();
+        FileAnalyzerFactory f = (FileAnalyzerFactory) factoryClass.getDeclaredConstructor().newInstance();
         registerAnalyzer(f);
         return f;
     }

src/org/opensolaris/opengrok/authorization/AuthorizationFramework.java

@@ -24,6 +24,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Modifier;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
@@ -395,20 +396,24 @@ public IAuthorizationPlugin handleLoadClass(String classname) {
      * instance of that class
      * @throws IllegalAccessException when the constructor of the class is not
      * accessible
+     * @throws NoSuchMethodException when the class does not have no-argument constructor
+     * @throws InvocationTargetException if the underlying constructor of the class throws an exception
      */
     private IAuthorizationPlugin loadClass(String classname) throws ClassNotFoundException,
             SecurityException,
             InstantiationException,
-            IllegalAccessException {
+            IllegalAccessException,
+            NoSuchMethodException,
+            InvocationTargetException {
 
-        Class c = loader.loadClass(classname);
+        Class<?> c = loader.loadClass(classname);
 
         // check for implemented interfaces
         for (Class intf1 : getInterfaces(c)) {
             if (intf1.getCanonicalName().equals(IAuthorizationPlugin.class.getCanonicalName())
                     && !Modifier.isAbstract(c.getModifiers())) {
                 // call to non-parametric constructor
-                return (IAuthorizationPlugin) c.newInstance();
+                return (IAuthorizationPlugin) c.getDeclaredConstructor().newInstance();
             }
         }
         LOGGER.log(Level.FINEST, "Plugin class \"{0}\" does not implement IAuthorizationPlugin interface.", classname);

src/org/opensolaris/opengrok/authorization/AuthorizationPlugin.java

@@ -215,7 +215,8 @@ public boolean setPlugin(IAuthorizationPlugin plugin) {
              * the whole stack walk through and prevent the other authorization
              * entities to work properly.
              */
-            return (this.plugin = plugin.getClass().newInstance()) != null;
+            this.plugin = plugin.getClass().getDeclaredConstructor().newInstance();
+            return true;
         } catch (InstantiationException ex) {
             LOGGER.log(Level.INFO, "Class could not be instantiated: ", ex);
         } catch (IllegalAccessException ex) {

src/org/opensolaris/opengrok/authorization/AuthorizationPluginClassLoader.java

@@ -192,7 +192,7 @@ private void checkPackage(String name) throws SecurityException {
      * @throws SecurityException if the loader cannot access the class
      */
     @Override
-    public Class loadClass(String name) throws ClassNotFoundException, SecurityException {
+    public Class<?> loadClass(String name) throws ClassNotFoundException, SecurityException {
         return loadClass(name, true);
     }
 

src/org/opensolaris/opengrok/configuration/messages/Message.java

@@ -119,8 +119,8 @@ public static Message createMessage(String type) {
         classname += type.substring(1) + "Message";
 
         try {
-            Class concreteClass = Class.forName(classname);
-            return (Message) concreteClass.newInstance();
+            Class<?> concreteClass = Class.forName(classname);
+            return (Message) concreteClass.getDeclaredConstructor().newInstance();
         } catch (Throwable ex) {
             LOGGER.log(Level.WARNING, "Couldn't create message object of type \"{0}\".", type);
         }

src/org/opensolaris/opengrok/history/HistoryGuru.java

@@ -25,6 +25,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -369,9 +370,9 @@ private Collection<RepositoryInfo> addRepositories(File[] files,
                 Repository repository = null;
                 try {
                     repository = RepositoryFactory.getRepository(file);
-                } catch (InstantiationException ie) {
+                } catch (InstantiationException | NoSuchMethodException | InvocationTargetException e) {
                     LOGGER.log(Level.WARNING, "Could not create repository for '"
-                            + file + "', could not instantiate the repository.", ie);
+                            + file + "', could not instantiate the repository.", e);
                 } catch (IllegalAccessException iae) {
                     LOGGER.log(Level.WARNING, "Could not create repository for '"
                             + file + "', missing access rights.", iae);

src/org/opensolaris/opengrok/history/RepositoryFactory.java

@@ -24,6 +24,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.logging.Level;
@@ -88,18 +89,19 @@ public static List<Class<? extends Repository>> getRepositoryClasses() {
      *
      * @param file File that might contain a repository
      * @return Correct repository for the given file
-     * @throws java.lang.InstantiationException in case we cannot create the
-     * repository object
-     * @throws java.lang.IllegalAccessException in case no permissions
-     * to repository file
+     * @throws InstantiationException in case we cannot create the repository object
+     * @throws IllegalAccessException in case no permissions to repository file
+     * @throws NoSuchMethodException in case we cannot create the repository object
+     * @throws InvocationTargetException in case we cannot create the repository object
      */
-    public static Repository getRepository(File file) throws InstantiationException, IllegalAccessException {
+    public static Repository getRepository(File file) throws InstantiationException, IllegalAccessException, 
+            NoSuchMethodException, InvocationTargetException {
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
         Repository repo = null;
 
         for (Repository rep : repositories) {
             if (rep.isRepositoryFor(file)) {
-                repo = rep.getClass().newInstance();
+                repo = rep.getClass().getDeclaredConstructor().newInstance();
                 try {
                     repo.setDirectoryName(file.getCanonicalPath());
                 } catch (IOException e) {
@@ -170,11 +172,13 @@ public static Repository getRepository(File file) throws InstantiationException,
      *
      * @param info Information about the repository
      * @return Correct repository for the given file
-     * @throws java.lang.InstantiationException in case we cannot create the
-     * repository object
-     * @throws java.lang.IllegalAccessException in case no permissions to repository
+     * @throws InstantiationException in case we cannot create the repository object
+     * @throws IllegalAccessException in case no permissions to repository
+     * @throws NoSuchMethodException in case we cannot create the repository object
+     * @throws InvocationTargetException in case we cannot create the repository object
      */
-    public static Repository getRepository(RepositoryInfo info) throws InstantiationException, IllegalAccessException {
+    public static Repository getRepository(RepositoryInfo info) throws InstantiationException, IllegalAccessException, 
+            NoSuchMethodException, InvocationTargetException {
         return getRepository(new File(info.getDirectoryName()));
     }
 

src/org/opensolaris/opengrok/index/Indexer.java

@@ -27,6 +27,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Paths;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -754,7 +755,8 @@ private static void configureFileAnalyzer(String fileSpec, String analyzer) {
                         AnalyzerGuru.findFactory(analyzer));
                 }
 
-            } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+            } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException 
+                    | InvocationTargetException e) {
                 LOGGER.log(Level.SEVERE, "Unable to locate FileAnalyzerFactory for {0}", analyzer);
                 LOGGER.log(Level.SEVERE, "Stack: ", e.fillInStackTrace());
                 System.exit(1);

src/org/opensolaris/opengrok/logger/LoggerUtil.java

@@ -27,6 +27,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
 import java.util.logging.ConsoleHandler;
 import java.util.logging.FileHandler;
 import java.util.logging.Formatter;
@@ -117,8 +118,9 @@ public static void setFileHandlerLogPath(String path) throws IOException {
                 String formatter = LogManager.getLogManager().getProperty("java.util.logging.FileHandler.formatter");
                 newFileHandler.setLevel(fileHandler.getLevel());
                 try {
-                    newFileHandler.setFormatter((Formatter) Class.forName(formatter).newInstance());
-                } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+                    newFileHandler.setFormatter((Formatter) Class.forName(formatter).getDeclaredConstructor().newInstance());
+                } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | NoSuchMethodException 
+                        | InvocationTargetException e) {
                     newFileHandler.setFormatter(new FileLogFormatter());
                 }
                 getBaseLogger().addHandler(newFileHandler);
@@ -169,8 +171,9 @@ public static String initLogger(String logpath, Level filelevel, Level consolele
             fh.setLevel(filelevel);
             String formatter = LogManager.getLogManager().getProperty("java.util.logging.FileHandler.formatter");
             try {
-                fh.setFormatter((Formatter) Class.forName(formatter).newInstance());
-            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+                fh.setFormatter((Formatter) Class.forName(formatter).getDeclaredConstructor().newInstance());
+            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException | NoSuchMethodException 
+                    | InvocationTargetException e) {
                 fh.setFormatter(new FileLogFormatter());
             }
 

src/org/opensolaris/opengrok/web/Statistics.java

@@ -103,7 +103,7 @@ synchronized protected void maybeRefresh() {
     synchronized public void addRequest(String category) {
         Long val = requestCategories.get(category);
         if (val == null) {
-            val = new Long(0);
+            val = 0L;
         }
         val += 1;
         requestCategories.put(category, val);
@@ -122,13 +122,13 @@ synchronized public void addRequestTime(String category, long v) {
         Long max = timingMax.get(category);
 
         if (val == null) {
-            val = new Long(0);
+            val = 0L;
         }
         if (max == null || v > max) {
-            max = new Long(v);
+            max = v;
         }
         if (min == null || v < min) {
-            min = new Long(v);
+            min = v;
         }
 
         val += v;