This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch coheigea/saml-refactor-new
in repository https://gitbox.apache.org/repos/asf/ws-wss4j.git
commit f680675e4798f727179b5f9e521f1ce3dc3336af
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Thu Jun 19 15:30:24 2025 +0100
Renaming Processor method to return supported QName
---
.../src/main/java/org/apache/wss4j/dom/engine/WSSConfig.java | 4 ++--
.../org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java | 2 +-
.../java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java | 2 +-
.../org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java | 2 +-
.../java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java | 2 +-
.../java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java | 2 +-
.../src/main/java/org/apache/wss4j/dom/processor/Processor.java | 2 +-
.../java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java | 2 +-
.../main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java | 2 +-
.../org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java | 2 +-
.../apache/wss4j/dom/processor/SignatureConfirmationProcessor.java | 2 +-
.../main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java | 2 +-
.../main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java | 2 +-
.../java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java | 2 +-
.../src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java | 2 +-
15 files changed, 16 insertions(+), 16 deletions(-)
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 28e076aeb..1aed92d0a 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
@@ -104,7 +104,7 @@ public final class WSSConfig {
* META-INF/services/org.apache.wss4j.dom.processor.Processor with its
fully qualified class name.
*
* You will still need to map QNames to Processor classes. This can be
done by having each Processor
- * implementation provide a method (e.g., getQNames()) that returns the
QNames it supports.
+ * implementation provide a method (e.g., getSupportedQNames()) that
returns the QNames it supports.
*/
private static final Map<QName, Class<?>> DEFAULT_PROCESSORS;
static {
@@ -112,7 +112,7 @@ public final class WSSConfig {
try {
java.util.ServiceLoader<Processor> loader =
java.util.ServiceLoader.load(Processor.class);
for (Processor processor : loader) {
- for (QName qname : processor.getQNames()) {
+ for (QName qname : processor.getSupportedQNames()) {
tmp.put(qname, processor.getClass());
}
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java
index a75482c8f..14a19d584 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java
@@ -182,7 +182,7 @@ public class BinarySecurityTokenProcessor implements
Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.BINARY_TOKEN};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java
index 3959babef..340a72b32 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/DerivedKeyTokenProcessor.java
@@ -95,7 +95,7 @@ public class DerivedKeyTokenProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.DERIVED_KEY_TOKEN_05_02,
WSConstants.DERIVED_KEY_TOKEN_05_12};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
index 5fb5f9e71..3707c31e7 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedAssertionProcessor.java
@@ -126,7 +126,7 @@ public class EncryptedAssertionProcessor implements
Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.ENCRYPTED_ASSERTION};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
index 3b1aa3f7d..4ad6402d7 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedDataProcessor.java
@@ -223,7 +223,7 @@ public class EncryptedDataProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.ENCRYPTED_DATA};
}
}
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 2bec768c1..cfa039e8b 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
@@ -810,7 +810,7 @@ public class EncryptedKeyProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.ENCRYPTED_KEY};
}
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/Processor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/Processor.java
index e71e8552a..8c40d97cf 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/Processor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/Processor.java
@@ -35,6 +35,6 @@ public interface Processor {
RequestData request
) throws WSSecurityException;
- QName[] getQNames();
+ QName[] getSupportedQNames();
}
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 9b2ae2949..f238f153f 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
@@ -243,7 +243,7 @@ public class ReferenceListProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.REFERENCE_LIST};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
index 2b5808241..47d2e902b 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
@@ -286,7 +286,7 @@ public class SAMLTokenProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.SAML_TOKEN, WSConstants.SAML2_TOKEN};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
index 1b806e094..77915fee8 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SecurityContextTokenProcessor.java
@@ -118,7 +118,7 @@ public class SecurityContextTokenProcessor implements
Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.SECURITY_CONTEXT_TOKEN_05_02,
WSConstants.SECURITY_CONTEXT_TOKEN_05_12};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
index d6ddc520d..7de7a1a7c 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureConfirmationProcessor.java
@@ -56,7 +56,7 @@ public class SignatureConfirmationProcessor implements
Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.SIGNATURE_CONFIRMATION};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
index 1a257cc62..add2f9fba 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
@@ -765,7 +765,7 @@ public class SignatureProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.SIGNATURE};
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
index 2bf1deccb..1086d77a3 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/TimestampProcessor.java
@@ -68,7 +68,7 @@ public class TimestampProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.TIMESTAMP};
}
}
diff --git
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
index 44b787f80..f8d6e73bf 100644
---
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
+++
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
@@ -178,7 +178,7 @@ public class UsernameTokenProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
return new QName[]{WSConstants.USERNAME_TOKEN};
}
diff --git
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java
index baad8ecf1..d8d64f3cf 100644
---
a/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java
+++
b/ws-security-dom/src/test/java/org/apache/wss4j/dom/common/CustomProcessor.java
@@ -45,7 +45,7 @@ public class CustomProcessor implements Processor {
}
@Override
- public QName[] getQNames() {
+ public QName[] getSupportedQNames() {
// TODO Auto-generated method stub
throw new UnsupportedOperationException("Unimplemented method
'getQNames'");
}
