This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
The following commit(s) were added to refs/heads/master by this push:
new 7a9ce441e Removing unused parameters
7a9ce441e is described below
commit 7a9ce441e4dccaa6ce037dfe91198441399610ff
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Wed Jul 20 07:20:39 2022 +0100
Removing unused parameters
---
.../main/java/org/apache/wss4j/dom/handler/WSHandler.java | 13 +++++--------
.../main/java/org/apache/wss4j/dom/message/Encryptor.java | 2 +-
.../org/apache/wss4j/dom/message/WSSecSignatureBase.java | 3 +--
.../apache/wss4j/dom/processor/EncryptedKeyProcessor.java | 8 +++-----
.../apache/wss4j/dom/processor/ReferenceListProcessor.java | 2 +-
.../main/java/org/apache/wss4j/dom/str/STRParserUtil.java | 7 ++-----
.../java/org/apache/wss4j/dom/util/EncryptionUtils.java | 2 --
.../main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java | 3 +--
8 files changed, 14 insertions(+), 26 deletions(-)
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 33da87937..4ee2d0c79 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
@@ -1002,7 +1002,7 @@ public abstract class WSHandler {
String propFilename,
RequestData reqData
) throws WSSecurityException {
- ClassLoader classLoader = this.getClassLoader(reqData.getMsgContext());
+ ClassLoader classLoader = this.getClassLoader();
Properties properties = CryptoFactory.getProperties(propFilename,
classLoader);
return
CryptoFactory.getInstance(
@@ -1034,7 +1034,7 @@ public abstract class WSHandler {
if (cbHandler == null) {
String callback = getString(callbackHandlerClass, mc);
if (callback != null) {
- cbHandler = loadCallbackHandler(callback, requestData);
+ cbHandler = loadCallbackHandler(callback);
}
}
return cbHandler;
@@ -1059,20 +1059,18 @@ public abstract class WSHandler {
/**
* Load a CallbackHandler instance.
* @param callbackHandlerClass The class name of the CallbackHandler
instance
- * @param requestData The RequestData which supplies the message context
* @return a CallbackHandler instance
* @throws WSSecurityException
*/
private CallbackHandler loadCallbackHandler(
- String callbackHandlerClass,
- RequestData requestData
+ String callbackHandlerClass
) throws WSSecurityException {
Class<? extends CallbackHandler> cbClass = null;
CallbackHandler cbHandler = null;
try {
cbClass =
- Loader.loadClass(getClassLoader(requestData.getMsgContext()),
+ Loader.loadClass(getClassLoader(),
callbackHandlerClass,
CallbackHandler.class);
} catch (ClassNotFoundException e) {
@@ -1450,10 +1448,9 @@ public abstract class WSHandler {
/**
* Returns the classloader to be used for loading the callback class
- * @param msgCtx The MessageContext
* @return class loader
*/
- public ClassLoader getClassLoader(Object msgCtx) {
+ public ClassLoader getClassLoader() {
try {
return Loader.getTCL();
} catch (Exception ex) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
index 9424d9566..3f16391d9 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
@@ -116,7 +116,7 @@ public class Encryptor {
callbackLookup = new DOMCallbackLookup(doc);
}
List<Element> elementsToEncrypt =
- WSSecurityUtil.findElements(encPart, callbackLookup, doc);
+ WSSecurityUtil.findElements(encPart, callbackLookup);
if (elementsToEncrypt == null || elementsToEncrypt.isEmpty()) {
if (!encPart.isRequired()) {
continue;
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
index c34f19f40..5901112a8 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
@@ -175,8 +175,7 @@ public class WSSecSignatureBase extends WSSecBase {
if (callbackLookup == null) {
callbackLookup = new DOMCallbackLookup(doc);
}
- elementsToSign =
- WSSecurityUtil.findElements(encPart,
callbackLookup, doc);
+ elementsToSign = WSSecurityUtil.findElements(encPart,
callbackLookup);
}
if (elementsToSign == null || elementsToSign.isEmpty()) {
if (!encPart.isRequired()) {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
index a92c75484..2f7e2b223 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
@@ -281,8 +281,7 @@ public class EncryptedKeyProcessor implements Processor {
String algorithmURI = null;
if (uri != null) {
Element ee =
-
EncryptionUtils.findEncryptedDataElement(refList.getOwnerDocument(),
- wsDocInfo, uri);
+ EncryptionUtils.findEncryptedDataElement(wsDocInfo, uri);
algorithmURI = X509Util.getEncAlgo(ee);
}
return X509Util.getSecretKey(keyInfoChildElement, algorithmURI,
data.getCallbackHandler());
@@ -381,8 +380,7 @@ public class EncryptedKeyProcessor implements Processor {
if (uri != null) {
Element ee =
-
EncryptionUtils.findEncryptedDataElement(refList.getOwnerDocument(),
- wsDocInfo,
uri);
+ EncryptionUtils.findEncryptedDataElement(wsDocInfo, uri);
String algorithmURI = X509Util.getEncAlgo(ee);
alg = JCEMapper.getJCEKeyAlgorithmFromURI(algorithmURI);
size = KeyUtils.getKeyLength(algorithmURI);
@@ -550,7 +548,7 @@ public class EncryptedKeyProcessor implements Processor {
// Find the encrypted data element referenced by dataRefURI
//
Element encryptedDataElement =
- EncryptionUtils.findEncryptedDataElement(doc, docInfo, dataRefURI);
+ EncryptionUtils.findEncryptedDataElement(docInfo, dataRefURI);
if (encryptedDataElement != null &&
data.isRequireSignedEncryptedDataElements()) {
List<WSSecurityEngineResult> signedResults =
docInfo.getResultsByTag(WSConstants.SIGN);
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
index 5b51eb13e..aa062bfac 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
@@ -119,7 +119,7 @@ public class ReferenceListProcessor implements Processor {
// Find the encrypted data element referenced by dataRefURI
//
Element encryptedDataElement =
- EncryptionUtils.findEncryptedDataElement(doc, data.getWsDocInfo(),
dataRefURI);
+ EncryptionUtils.findEncryptedDataElement(data.getWsDocInfo(),
dataRefURI);
if (encryptedDataElement != null &&
data.isRequireSignedEncryptedDataElements()) {
List<WSSecurityEngineResult> signedResults =
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
index 4e899ce5e..689c92ed0 100644
--- a/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
+++ b/ws-security-dom/src/main/java/org/apache/wss4j/dom/str/STRParserUtil.java
@@ -98,8 +98,7 @@ public final class STRParserUtil {
}
token =
findUnprocessedTokenElement(
- strElement.getOwnerDocument(), request.getWsDocInfo(),
request.getCallbackHandler(),
- keyIdentifierValue, type
+ strElement.getOwnerDocument(), request.getWsDocInfo(),
keyIdentifierValue, type
);
if (token == null || !"Assertion".equals(token.getLocalName())) {
@@ -302,7 +301,7 @@ public final class STRParserUtil {
Element tokElement =
findProcessedTokenElement(doc, docInfo, cb, uri, valueType);
if (tokElement == null) {
- tokElement = findUnprocessedTokenElement(doc, docInfo, cb, uri,
valueType);
+ tokElement = findUnprocessedTokenElement(doc, docInfo, uri,
valueType);
}
if (tokElement == null) {
@@ -318,7 +317,6 @@ public final class STRParserUtil {
* the element, rather than trying to access previous results to find the
element
* @param doc Parent Document
* @param docInfo WSDocInfo instance
- * @param cb CallbackHandler instance
* @param uri URI of the element
* @param type Type of the element
* @return A DOM element
@@ -327,7 +325,6 @@ public final class STRParserUtil {
public static Element findUnprocessedTokenElement(
Document doc,
WSDocInfo docInfo,
- CallbackHandler cb,
String uri,
String type
) throws WSSecurityException {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
index 4a0074626..f01f07a1b 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
@@ -65,7 +65,6 @@ public final class EncryptionUtils {
* Look up the encrypted data. First try Id="someURI". If no such Id then
try
* wsu:Id="someURI".
*
- * @param doc The document in which to find EncryptedData
* @param wsDocInfo The WSDocInfo object to use
* @param dataRefURI The URI of EncryptedData
* @return The EncryptedData element
@@ -74,7 +73,6 @@ public final class EncryptionUtils {
*/
public static Element
findEncryptedDataElement(
- Document doc,
WSDocInfo wsDocInfo,
String dataRefURI
) throws WSSecurityException {
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
index fd0e570bd..1496a740e 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
@@ -288,11 +288,10 @@ public final class WSSecurityUtil {
*
* @param part The WSEncryptionPart object corresponding to the DOM
Element(s) we want
* @param callbackLookup The CallbackLookup object used to find Elements
- * @param doc The owning document
* @return the DOM Element in the SOAP Envelope that is found
*/
public static List<Element> findElements(
- WSEncryptionPart part, CallbackLookup callbackLookup, Document doc
+ WSEncryptionPart part, CallbackLookup callbackLookup
) throws WSSecurityException {
// See if the DOM Element is stored in the WSEncryptionPart first
if (part.getElement() != null) {
