You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2021/11/14 11:32:18 UTC

[ws-axiom] branch master updated: Eliminate usages of deprecated methods

This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-axiom.git


The following commit(s) were added to refs/heads/master by this push:
     new 28e7627  Eliminate usages of deprecated methods
28e7627 is described below

commit 28e7627ece38d795f2a04217fce569c4272c699c
Author: Andreas Veithen <an...@gmail.com>
AuthorDate: Sun Nov 14 11:32:05 2021 +0000

    Eliminate usages of deprecated methods
---
 .../main/java/org/apache/axiom/locator/ImplementationFactory.java | 2 +-
 .../src/main/java/org/apache/axiom/om/OMAbstractFactory.java      | 8 +++++++-
 .../org/apache/axiom/util/stax/dialect/StAXImplementation.java    | 2 +-
 .../main/java/org/apache/axiom/ts/jaxp/XSLTImplementation.java    | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/axiom-api/src/main/java/org/apache/axiom/locator/ImplementationFactory.java b/axiom-api/src/main/java/org/apache/axiom/locator/ImplementationFactory.java
index c45282e..ddf2de0 100644
--- a/axiom-api/src/main/java/org/apache/axiom/locator/ImplementationFactory.java
+++ b/axiom-api/src/main/java/org/apache/axiom/locator/ImplementationFactory.java
@@ -68,7 +68,7 @@ final class ImplementationFactory {
             return null;
         }
         try {
-            return clazz.newInstance();
+            return clazz.getDeclaredConstructor().newInstance();
         } catch (Exception ex) {
             log.error("The class " + className + " could not be instantiated", ex);
             return null;
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java b/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java
index b6b69a2..4bb80f0 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMAbstractFactory.java
@@ -19,6 +19,8 @@
 
 package org.apache.axiom.om;
 
+import java.lang.reflect.InvocationTargetException;
+
 import org.apache.axiom.om.dom.DOMMetaFactory;
 import org.apache.axiom.soap.SOAPFactory;
 
@@ -101,13 +103,17 @@ public class OMAbstractFactory {
         // reflection avoids introducing a circular dependency between the org.apache.axiom.om
         // and org.apache.axiom.locator packages.
         try {
-            defaultMetaFactoryLocator = (OMMetaFactoryLocator)Class.forName(DEFAULT_LOCATOR_CLASS_NAME).newInstance();
+            defaultMetaFactoryLocator = (OMMetaFactoryLocator)Class.forName(DEFAULT_LOCATOR_CLASS_NAME).getDeclaredConstructor().newInstance();
         } catch (InstantiationException ex) {
             throw new InstantiationError(ex.getMessage());
         } catch (IllegalAccessException ex) {
             throw new IllegalAccessError(ex.getMessage());
         } catch (ClassNotFoundException ex) {
             throw new NoClassDefFoundError(ex.getMessage());
+        } catch (NoSuchMethodException ex) {
+            throw new NoSuchMethodError(ex.getMessage());
+        } catch (InvocationTargetException ex) {
+            throw new RuntimeException(ex.getCause());
         }
     }
     
diff --git a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java
index cdc0539..81ccfdf 100644
--- a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java
+++ b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/StAXImplementation.java
@@ -64,7 +64,7 @@ public final class StAXImplementation {
         }
         T factory;
         try {
-            factory = classLoader.loadClass(className).asSubclass(type).newInstance();
+            factory = classLoader.loadClass(className).asSubclass(type).getDeclaredConstructor().newInstance();
         } catch (Exception ex) {
             throw new FactoryConfigurationError(ex);
         }
diff --git a/testing/jaxp-testsuite/src/main/java/org/apache/axiom/ts/jaxp/XSLTImplementation.java b/testing/jaxp-testsuite/src/main/java/org/apache/axiom/ts/jaxp/XSLTImplementation.java
index f88244c..6dfcfb2 100644
--- a/testing/jaxp-testsuite/src/main/java/org/apache/axiom/ts/jaxp/XSLTImplementation.java
+++ b/testing/jaxp-testsuite/src/main/java/org/apache/axiom/ts/jaxp/XSLTImplementation.java
@@ -72,8 +72,8 @@ public abstract class XSLTImplementation extends Multiton {
                     @Override
                     public TransformerFactory newTransformerFactory() {
                         try {
-                            return clazz.newInstance();
-                        } catch (InstantiationException | IllegalAccessException ex) {
+                            return clazz.getDeclaredConstructor().newInstance();
+                        } catch (ReflectiveOperationException ex) {
                             throw new RuntimeException(ex);
                         }
                     }