Changeset 35362

Timestamp:

2021-09-11T14:06:07+12:00 (3 years ago)

Author:

kjdon

Message:

Class.newInstance() is deprecated. Use getDeclaredConstructor().newInstance() instead

Location:

main/trunk/greenstone3/src/java/org/greenstone/gsdl3

Files:

• LibraryServlet.java (modified) (3 diffs)
• OAIServer.java (modified) (1 diff)
• collection/ServiceCluster.java (modified) (2 diffs)
• core/MessageRouter.java (modified) (2 diffs)
• core/Receptionist.java (modified) (2 diffs)
• sql/DatabaseFactory.java (modified) (6 diffs)
• sql/derby/DerbySQLServer.java (modified) (1 diff)
• util/DerbyWrapper.java (modified) (1 diff)
• util/SimpleCollectionDatabase.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/LibraryServlet.java

@@ -231 +231 @@
     try
       {
-        this.recept = (Receptionist) Class.forName("org.greenstone.gsdl3.core." + recept_name).newInstance();
+        this.recept = (Receptionist) Class.forName("org.greenstone.gsdl3.core." + recept_name).getDeclaredConstructor().newInstance();
       }
     catch (Exception e)
@@ -253 +253 @@
     try
       {
-        this.gs_params = (GSParams) Class.forName("org.greenstone.gsdl3.util." + params_name).newInstance();
+        this.gs_params = (GSParams) Class.forName("org.greenstone.gsdl3.util." + params_name).getDeclaredConstructor().newInstance();
       }
     catch (Exception e)
@@ -276 +276 @@
         try
           {
-        message_router = (MessageRouter) Class.forName("org.greenstone.gsdl3.core." + mr_name).newInstance();
+        message_router = (MessageRouter) Class.forName("org.greenstone.gsdl3.core." + mr_name).getDeclaredConstructor().newInstance();
           }
         catch (Exception e)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/OAIServer.java

@@ -165 +165 @@
                 try
                 {
-                    message_router = (OAIMessageRouter) Class.forName("org.greenstone.gsdl3.core." + mr_name).newInstance();
+                                  message_router = (OAIMessageRouter) Class.forName("org.greenstone.gsdl3.core." + mr_name).getDeclaredConstructor().newInstance();
                 }
                 catch (Exception e)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/collection/ServiceCluster.java

@@ -460 +460 @@
             {
                 // try for a default service in standard package
-                s = (ServiceRack) Class.forName("org.greenstone.gsdl3.service." + servicetype).newInstance();
+                          s = (ServiceRack) Class.forName("org.greenstone.gsdl3.service." + servicetype).getDeclaredConstructor().newInstance();
             }
             catch (Exception e)
@@ -470 +470 @@
                 {
                     // name as is, in case package is already specified
-                    s = (ServiceRack) Class.forName(servicetype).newInstance();
+                                  s = (ServiceRack) Class.forName(servicetype).getDeclaredConstructor().newInstance();
                 }
                 catch (Exception e)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java

@@ -559 +559 @@
             try
             {
-                ServiceRack s = (ServiceRack) service_class.newInstance();
+                          ServiceRack s = (ServiceRack) service_class.getDeclaredConstructor().newInstance();
                 s.setSiteHome(this.site_home);
                 s.setSiteAddress(this.site_http_address);
@@ -733 +733 @@
                         try
                         {
-                            c = (Collection) Class.forName("org.greenstone.gsdl3.collection." + coll_class_name).newInstance();
+                                                  c = (Collection) Class.forName("org.greenstone.gsdl3.collection." + coll_class_name).getDeclaredConstructor().newInstance();
                         }
                         catch (Exception e)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java

@@ -156 +156 @@
             try
             {
-                ac = (Action) Class.forName("org.greenstone.gsdl3.action." + class_name).newInstance();
+                          ac = (Action) Class.forName("org.greenstone.gsdl3.action." + class_name).getDeclaredConstructor().newInstance();
             }
             catch (Exception e)
@@ -232 +232 @@
             {
                 action_name = action.substring(0, 1).toUpperCase() + action.substring(1) + "Action";
-                Action ac = (Action) Class.forName("org.greenstone.gsdl3.action." + action_name).newInstance();
+                Action ac = (Action) Class.forName("org.greenstone.gsdl3.action." + action_name).getDeclaredConstructor().newInstance();
                 ac.setConfigParams(this.config_params);
                 ac.setMessageRouter(this.mr);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java

@@ -32 +32 @@
     String fullName = "org.greenstone.gsdl3.sql." + dbname.toLowerCase()+ "." + dbname +"SQLServer";
     try {
-        SQLServer server = (SQLServer)Class.forName(fullName).newInstance();
+          SQLServer server = (SQLServer)Class.forName(fullName).getDeclaredConstructor().newInstance();
         serverMap.put(dbname, server);
         return server;
@@ -46 +46 @@
     //load SQLStatements class
        try{
-       SQLStatements state = (SQLStatements)Class.forName(fullsqlstate).newInstance(); 
+         SQLStatements state = (SQLStatements)Class.forName(fullsqlstate).getDeclaredConstructor().newInstance(); 
        return state;
        }
@@ -52 +52 @@
        // if falied use sqlstate as a full path
        try{
-           SQLStatements state = (SQLStatements)Class.forName(sqlstate).newInstance(); 
+             SQLStatements state = (SQLStatements)Class.forName(sqlstate).getDeclaredConstructor().newInstance(); 
            return state;
        }
@@ -69 +69 @@
     String fullName = "org.greenstone.gsdl3.sql." + dbname.toLowerCase()+ "." + dbname +"DBWrapper";
     try {
-        MetadataDBWrapper wrapper = (MetadataDBWrapper)Class.forName(fullName).newInstance();
+          MetadataDBWrapper wrapper = (MetadataDBWrapper)Class.forName(fullName).getDeclaredConstructor().newInstance();
         if (wrapper != null){
         //load SQLServer class
@@ -80 +80 @@
         //load SQLStatements class
         try{
-           SQLStatements state = (SQLStatements)Class.forName(fullsqlstate).newInstance(); 
+                  SQLStatements state = (SQLStatements)Class.forName(fullsqlstate).getDeclaredConstructor().newInstance(); 
            if (state != null){
                wrapper.setSQLStatements(state); 
@@ -89 +89 @@
             // if falied use sqlstate as a full path
             try{
-            SQLStatements state = (SQLStatements)Class.forName(sqlstate).newInstance(); 
+                      SQLStatements state = (SQLStatements)Class.forName(sqlstate).getDeclaredConstructor().newInstance(); 
             if (state != null){
                 wrapper.setSQLStatements(state);

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbySQLServer.java

@@ -20 +20 @@
     public DerbySQLServer(){
     try{
-        Class.forName(DRIVER).newInstance();
+          Class.forName(DRIVER).getDeclaredConstructor().newInstance();
     }
         catch(Exception e){

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/DerbyWrapper.java

@@ -125 +125 @@
             }
 
-            Class.forName(DRIVER).newInstance();
+            Class.forName(DRIVER).getDeclaredConstructor().newInstance();
             protocol_str = PROTOCOL + dbpath;
             if (create_database)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/SimpleCollectionDatabase.java

@@ -79 +79 @@
         try
         {
-            this.coll_db = (FlatDatabaseWrapper) dbwrap_class.newInstance();
+                  this.coll_db = (FlatDatabaseWrapper) dbwrap_class.getDeclaredConstructor().newInstance();
         }
         catch (Exception e)