(ws-wss4j) branch coheigea/saml-refactor-new updated: Removing some TODOs from the validators

[coheigea]

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


The following commit(s) were added to refs/heads/coheigea/saml-refactor-new by 
this push:
     new 63a894f10 Removing some TODOs from the validators
63a894f10 is described below

commit 63a894f1031d0f59e100f2ca3b8f99d68f10745e
Author: Colm O hEigeartaigh <cohei...@apache.org>
AuthorDate: Fri Jul 4 11:19:54 2025 +0100

    Removing some TODOs from the validators
---
 .../org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java    | 3 +--
 .../java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java   | 5 ++---
 .../src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java   | 3 +--
 .../java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java    | 2 +-
 .../test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java    | 5 ++---
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
index 6547c2b05..5f6b7ae49 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/JAASUsernameTokenValidator.java
@@ -124,8 +124,7 @@ public class JAASUsernameTokenValidator implements 
Validator {
 
     @Override
     public QName[] getSupportedQNames() {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 
'getSupportedQNames'");
+        return new QName[]{WSConstants.USERNAME_TOKEN};
     }
 
 }
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java
index f398bd410..7bbd9b980 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/KerberosTokenValidator.java
@@ -40,6 +40,7 @@ import org.apache.wss4j.common.kerberos.KerberosTokenDecoder;
 import org.apache.wss4j.common.kerberos.KerberosTokenDecoderException;
 import org.apache.wss4j.common.token.BinarySecurity;
 import org.apache.wss4j.common.dom.RequestData;
+import org.apache.wss4j.common.dom.WSConstants;
 import org.apache.wss4j.common.dom.message.token.KerberosSecurity;
 
 /**
@@ -236,7 +237,6 @@ public class KerberosTokenValidator implements Validator {
                     LOG.debug("Session key could not be obtained from the 
KerberosTokenDecoder.");
                 }
             } catch (KerberosTokenDecoderException e) {
-                // TODO
                 throw new WSSecurityException(ErrorCode.FAILURE, e, "Error 
retrieving session key.");
             }
         } else {
@@ -283,7 +283,6 @@ public class KerberosTokenValidator implements Validator {
 
     @Override
     public QName[] getSupportedQNames() {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 
'getSupportedQNames'");
+        return new QName[]{WSConstants.BINARY_TOKEN};
     }
 }
diff --git 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java
 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java
index 30175cb0f..94458d03e 100644
--- 
a/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java
+++ 
b/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/NoOpValidator.java
@@ -45,8 +45,7 @@ public class NoOpValidator implements Validator {
 
     @Override
     public QName[] getSupportedQNames() {
-        // TODO Auto-generated method stub
-        throw new UnsupportedOperationException("Unimplemented method 
'getSupportedQNames'");
+        return new QName[]{};
     }
 
 }
diff --git 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java
 
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java
index a10e0599b..9d994311f 100644
--- 
a/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java
+++ 
b/ws-security-saml/src/main/java/org/apache/wss4j/common/saml/message/WSSecSAMLToken.java
@@ -115,7 +115,7 @@ public class WSSecSAMLToken extends WSSecBase {
      * A complete <code>SAMLAssertion</code> is added to the
      * <code>wsse:Security</code> header.
      *
-     * @param samlAssertion TODO
+     * @param samlAssertion the SAML Assertion to add
      * @return Document with UsernameToken added
      */
     public Document build(SamlAssertionWrapper samlAssertion) {
diff --git 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java
 
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java
index 1ffc13b8f..aff1e2bec 100644
--- 
a/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java
+++ 
b/ws-security-saml/src/test/java/org/apache/wss4j/common/saml/dom/ValidatorTest.java
@@ -203,11 +203,10 @@ public class ValidatorTest {
 
         @Override
         public QName[] getSupportedQNames() {
-            // TODO Auto-generated method stub
-            throw new UnsupportedOperationException("Unimplemented method 
'getSupportedQNames'");
+            return new QName[]{WSConstants.BINARY_TOKEN};
         }
 
     }
 
 
-}
\ No newline at end of file
+}