You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2022/11/08 13:06:34 UTC
[ws-wss4j] branch 2_4_x-fixes updated: Avoid using deprecated APIs
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 2_4_x-fixes
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/2_4_x-fixes by this push:
new efb7bed6e Avoid using deprecated APIs
efb7bed6e is described below
commit efb7bed6ee88d0e199e3122b1d7fde02a60db860
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Nov 8 12:56:54 2022 +0000
Avoid using deprecated APIs
---
.../main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java | 4 ++--
.../src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java | 6 +++---
.../src/main/java/org/apache/wss4j/dom/handler/WSHandler.java | 2 +-
.../src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java | 2 +-
.../stax/impl/processor/input/SecurityHeaderInputProcessor.java | 5 +++--
.../java/org/apache/wss4j/stax/setup/ConfigurationConverter.java | 2 +-
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java
index 139006b0a..139c057e0 100644
--- a/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java
+++ b/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/WSProviderConfig.java
@@ -214,7 +214,7 @@ public final class WSProviderConfig {
if (currentProvider == null) {
try {
Class<? extends Provider> clazz = Loader.loadClass(className, false, Provider.class);
- Provider provider = clazz.newInstance();
+ Provider provider = clazz.getDeclaredConstructor().newInstance();
return addJceProvider(name, provider);
} catch (Throwable t) {
if (LOG.isDebugEnabled()) {
@@ -282,7 +282,7 @@ public final class WSProviderConfig {
if (currentProvider == null) {
try {
Class<? extends Provider> clazz = Loader.loadClass(className, false, Provider.class);
- Provider provider = clazz.newInstance();
+ Provider provider = clazz.getDeclaredConstructor().newInstance();
int ret = Security.addProvider(provider);
LOG.debug(
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
index 5578df50b..9257ae739 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java
@@ -424,7 +424,7 @@ public final class WSSConfig {
if (actionObject instanceof Class<?>) {
try {
- return (Action)((Class<?>)actionObject).newInstance();
+ return (Action)((Class<?>)actionObject).getDeclaredConstructor().newInstance();
} catch (Exception ex) {
LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex,
@@ -514,7 +514,7 @@ public final class WSSConfig {
if (validatorObject instanceof Class<?>) {
try {
- return (Validator)((Class<?>)validatorObject).newInstance();
+ return (Validator)((Class<?>)validatorObject).getDeclaredConstructor().newInstance();
} catch (Exception ex) {
LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex,
@@ -538,7 +538,7 @@ public final class WSSConfig {
if (processorObject instanceof Class<?>) {
try {
- return (Processor)((Class<?>)processorObject).newInstance();
+ return (Processor)((Class<?>)processorObject).getDeclaredConstructor().newInstance();
} catch (Exception ex) {
LOG.debug(ex.getMessage(), ex);
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, ex,
diff --git a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
index 421b6718e..52b498418 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
@@ -1091,7 +1091,7 @@ public abstract class WSHandler {
);
}
try {
- cbHandler = cbClass.newInstance();
+ cbHandler = cbClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e,
"empty",
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java
index ff18aff0c..88e841501 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSCrypto.java
@@ -66,7 +66,7 @@ class WSSCrypto {
}
} else {
try {
- crypto = cryptoClass.newInstance();
+ crypto = cryptoClass.getDeclaredConstructor().newInstance();
crypto.setDefaultX509Identifier(ConfigurationProperties.getProperty("DefaultX509Alias"));
crypto.setCryptoProvider(ConfigurationProperties.getProperty("CertProvider"));
crypto.setKeyStore(this.getKeyStore());
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
index b9cb72406..c82ed7546 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityHeaderInputProcessor.java
@@ -18,6 +18,7 @@
*/
package org.apache.wss4j.stax.impl.processor.input;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayDeque;
import java.util.Deque;
@@ -214,9 +215,9 @@ public class SecurityHeaderInputProcessor extends AbstractInputProcessor {
return;
}
try {
- XMLSecurityHeaderHandler xmlSecurityHeaderHandler = clazz.newInstance();
+ XMLSecurityHeaderHandler xmlSecurityHeaderHandler = clazz.getDeclaredConstructor().newInstance();
xmlSecurityHeaderHandler.handle(inputProcessorChain, securityProperties, eventQueue, index);
- } catch (InstantiationException | IllegalAccessException e) {
+ } catch (NoSuchMethodException | InvocationTargetException | InstantiationException | IllegalAccessException e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.INVALID_SECURITY, e);
} catch (WSSecurityException e) {
throw e;
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java
index c223d01f6..1486a300f 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java
@@ -368,7 +368,7 @@ public final class ConfigurationConverter {
);
}
try {
- cbHandler = cbClass.newInstance();
+ cbHandler = cbClass.getDeclaredConstructor().newInstance();
} catch (Exception e) {
throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE, e,
"empty",