Fix Class#newInstance deprecation warnings

- c.getDeclaredConstructor().newInstance() can be used instead. - simplified exception handling in related code
mbien · Feb 10, 2024 · 966bac5 · 966bac5
1 parent 1a81cf3
commit 966bac5
Show file tree

Hide file tree

Showing 120 changed files with 370 additions and 567 deletions.
diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/JBDeploymentFactory.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/JBDeploymentFactory.java
@@ -413,9 +413,9 @@ private DeploymentFactory getFactory(String instanceURL) {
                     if(version!= null && "7".equals(version.getMajorNumber())) {
                         Class<?> c = loader.loadClass("org.jboss.as.ee.deployment.spi.factories.DeploymentFactoryImpl");
                         c.getMethod("register").invoke(null);
-                        jbossFactory = (DeploymentFactory) c.newInstance();//NOI18N
+                        jbossFactory = (DeploymentFactory) c.getDeclaredConstructor().newInstance();//NOI18N
                     } else {
-                        jbossFactory = (DeploymentFactory) loader.loadClass("org.jboss.deployment.spi.factories.DeploymentFactoryImpl").newInstance();//NOI18N
+                        jbossFactory = (DeploymentFactory) loader.loadClass("org.jboss.deployment.spi.factories.DeploymentFactoryImpl").getDeclaredConstructor().newInstance();//NOI18N
                     }
 
 

diff --git a/.../j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/CommonDDAccess.java b/.../j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/CommonDDAccess.java
@@ -58,7 +58,7 @@ public static BaseBean newBean(CommonDDBean parent, String beanName, String vers
 				PACKAGE_PREFIX
 				+ version + DOT
 				+ beanName);
-	    return (BaseBean) beanClass.newInstance();
+	    return (BaseBean) beanClass.getDeclaredConstructor().newInstance();
 
 	} catch (Exception e) {
             if (e instanceof ClassNotFoundException) 

diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/CommonDDAccess.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/CommonDDAccess.java
@@ -90,7 +90,7 @@ public static BaseBean newBean(CommonDDBean parent, String beanName, String pkgN
 				pkgName
                                 + DOT
 				+ beanName);
-	    return (BaseBean) beanClass.newInstance();
+	    return (BaseBean) beanClass.getDeclaredConstructor().newInstance();
 
 	} catch (Exception e) {
             if (e instanceof ClassNotFoundException) 

diff --git a/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/ServerLocationManager.java b/enterprise/j2ee.sun.appsrv/src/org/netbeans/modules/j2ee/sun/api/ServerLocationManager.java
@@ -210,7 +210,7 @@ public static synchronized ClassLoader getNetBeansAndServerClassLoader(File plat
 	    try {
 		data.cachedClassLoader =new ExtendedClassLoader( new Empty().getClass().getClassLoader());
 		updatePluginLoader( platformLocation, data.cachedClassLoader);
-		data.deploymentFactory =  (DeploymentFactory) data.cachedClassLoader.loadClass("com.sun.enterprise.deployapi.SunDeploymentFactory").newInstance();//NOI18N
+		data.deploymentFactory =  (DeploymentFactory) data.cachedClassLoader.loadClass("com.sun.enterprise.deployapi.SunDeploymentFactory").getDeclaredConstructor().newInstance();//NOI18N
                 data.serverOnlyClassLoader = new ExtendedClassLoader();
                 updatePluginLoader(platformLocation, data.serverOnlyClassLoader);
 	    } catch (Exception ex2) {

diff --git a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/DDProvider.java b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/api/DDProvider.java
@@ -472,7 +472,7 @@ public RootInterface newGraph(Class rootType, String version) {
                 try {
                     // Formerly invoked static 'createGraph()' method, but that is merely a wrapper 
                     // for the default constructor so we'll call it directly.
-                    graphRoot = (SunBaseBean) vInfo.getImplClass().newInstance();
+                    graphRoot = (SunBaseBean) vInfo.getImplClass().getDeclaredConstructor().newInstance();
                     graphRoot.graphManager().setDoctype(vInfo.getPublicId(), vInfo.getSystemId());
 
                     Class proxyClass = vInfo.getProxyClass();

diff --git a/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/SunBaseBean.java b/enterprise/j2ee.sun.dd/src/org/netbeans/modules/j2ee/sun/dd/impl/common/SunBaseBean.java
@@ -223,7 +223,7 @@ public CommonDDBean cloneVersion(String version) {
                 return (SunBaseBean) this.clone();
             }
 
-            bean = (SunBaseBean) newBeanClass.newInstance();
+            bean = (SunBaseBean) newBeanClass.getDeclaredConstructor().newInstance();
         } catch(Exception e) {
             throw new IllegalArgumentException(e.getMessage(), e);
         }

diff --git a/.../org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/GenericTablePanel.java b/.../org/netbeans/modules/j2ee/sun/share/configbean/customizers/common/GenericTablePanel.java
@@ -238,18 +238,15 @@ private GenericTableDialogPanelAccessor internalGetDialogPanel() {
 			GenericTableDialogPanelAccessor subPanel = null;
 
 			try {
-				subPanel = (GenericTableDialogPanelAccessor) entryPanelClass.newInstance();
+				subPanel = (GenericTableDialogPanelAccessor) entryPanelClass.getDeclaredConstructor().newInstance();
 				subPanel.init(getTableModel().getAppServerVersion(), 
                         GenericTablePanel.this.getWidth()*3/4, entryList, extraData);
 
 				((JPanel) subPanel).getAccessibleContext().setAccessibleName(
 					resourceBundle.getString("ACSN_POPUP_" + resourceBase));	// NOI18N
 				((JPanel) subPanel).getAccessibleContext().setAccessibleDescription(
 					resourceBundle.getString("ACSD_POPUP_" + resourceBase));	// NOI18N
-			} catch(InstantiationException ex) {
-				// !PW Should never happen, but it's fatal for field editing if 
-				// it does so what should exception should we throw?
-			} catch(IllegalAccessException ex) {
+			} catch(ReflectiveOperationException ex) {
 				// !PW Should never happen, but it's fatal for field editing if 
 				// it does so what should exception should we throw?
 			}

diff --git a/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/util/Utils.java b/enterprise/j2ee.sun.ddui/src/org/netbeans/modules/j2ee/sun/validation/util/Utils.java
@@ -119,12 +119,8 @@ public Object createObject(String type) {
         Object object = null;
         try {
           Class classObject = Class.forName(type);
-          object = classObject.newInstance();
-        } catch (InstantiationException e) {
-          System.out.println(e);
-        } catch (IllegalAccessException e) {
-          System.out.println(e);
-        } catch (ClassNotFoundException e) {
+          object = classObject.getDeclaredConstructor().newInstance();
+        } catch (ReflectiveOperationException e) {
           System.out.println(e);
         }
         return object;
@@ -142,10 +138,8 @@ public Object createObject(String type) {
     public Object createObject(Class classObject) {
         Object object = null;
         try {
-          object = classObject.newInstance();
-        } catch (InstantiationException e) {
-          System.out.println(e);
-        } catch (IllegalAccessException e) {
+          object = classObject.getDeclaredConstructor().newInstance();
+        } catch (ReflectiveOperationException e) {
           System.out.println(e);
         }
         return object;
@@ -171,13 +165,7 @@ public Object createObject(Constructor constructor,
         object = constructor.newInstance(arguments);
         //System.out.println ("Object: " + object.toString());
         return object;
-        } catch (InstantiationException e) {
-          System.out.println(e);
-        } catch (IllegalAccessException e) {
-          System.out.println(e);
-        } catch (IllegalArgumentException e) {
-          System.out.println(e);
-        } catch (InvocationTargetException e) {
+        } catch (ReflectiveOperationException e) {
           System.out.println(e);
         }
         return object;

diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/DeployOnSaveManager.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/DeployOnSaveManager.java
@@ -586,7 +586,7 @@ private void runJPDAAppReloaded() {
                 ClassLoader reloadedClassLoader = customDefClassLoaders.get(reloadedPackageName);
                 if (reloadedClassLoader != null) {
                     Class reloadedClass = reloadedClassLoader.loadClass(reloadedClassName);
-                    reloadedClass.getMethod("execute").invoke(reloadedClass.newInstance());
+                    reloadedClass.getMethod("execute").invoke(reloadedClass.getDeclaredConstructor().newInstance());
                 }
             } catch (Exception ex) {
                 Exceptions.printStackTrace(ex);