ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1757632 - in /webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input: SAMLTokenInputHandler.java UsernameTokenInputHandler.java
Date Thu, 25 Aug 2016 09:05:58 GMT
Author: coheigea
Date: Thu Aug 25 09:05:57 2016
New Revision: 1757632

URL: http://svn.apache.org/viewvc?rev=1757632&view=rev
Log:
Removing jdk 1.6 compiler warnings

Modified:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java?rev=1757632&r1=1757631&r2=1757632&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
Thu Aug 25 09:05:57 2016
@@ -49,7 +49,6 @@ import org.apache.wss4j.common.saml.Saml
 import org.apache.wss4j.stax.ext.WSInboundSecurityContext;
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
-import org.apache.wss4j.stax.impl.securityToken.SamlSecurityTokenImpl;
 import org.apache.wss4j.stax.securityEvent.SamlTokenSecurityEvent;
 import org.apache.wss4j.stax.securityEvent.SignedPartSecurityEvent;
 import org.apache.wss4j.stax.securityEvent.WSSecurityEventConstants;
@@ -199,15 +198,8 @@ public class SAMLTokenInputHandler exten
         final TokenContext tokenContext = 
             new TokenContext(wssSecurityProperties, wsInboundSecurityContext, xmlSecEvents,
elementPath);
 
-        //jdk 1.6 compiler bug? http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
-        //type parameters of <T>T cannot be determined; no unique maximal instance
exists for type variable T with
-        // upper bounds org.apache.wss4j.stax.securityToken.SamlSecurityToken,
-        // org.apache.wss4j.stax.securityToken.SamlSecurityToken,
-        // org.apache.xml.security.stax.ext.securityToken.InboundSecurityToken
-        //works fine on jdk 1.7
         final SamlSecurityToken samlSecurityToken =
-                samlTokenValidator.</*fake @see above*/SamlSecurityTokenImpl>
-                        validate(samlAssertionWrapper, subjectSecurityToken, tokenContext);
+                samlTokenValidator.validate(samlAssertionWrapper, subjectSecurityToken, tokenContext);
 
         SecurityTokenProvider<InboundSecurityToken> subjectSecurityTokenProvider =
                 new SecurityTokenProvider<InboundSecurityToken>() {

Modified: webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java?rev=1757632&r1=1757631&r2=1757632&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
(original)
+++ webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
Thu Aug 25 09:05:57 2016
@@ -30,7 +30,6 @@ import org.apache.wss4j.stax.ext.WSInbou
 import org.apache.wss4j.stax.ext.WSSConstants;
 import org.apache.wss4j.stax.ext.WSSSecurityProperties;
 import org.apache.wss4j.stax.securityToken.UsernameSecurityToken;
-import org.apache.wss4j.stax.impl.securityToken.UsernameSecurityTokenImpl;
 import org.apache.wss4j.stax.securityEvent.UsernameTokenSecurityEvent;
 import org.apache.wss4j.stax.validate.TokenContext;
 import org.apache.wss4j.stax.validate.UsernameTokenValidator;
@@ -109,15 +108,8 @@ public class UsernameTokenInputHandler e
         if (usernameTokenValidator == null) {
             usernameTokenValidator = new UsernameTokenValidatorImpl();
         }
-        //jdk 1.6 compiler bug? http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6302954
-        //type parameters of <T>T cannot be determined; no unique maximal instance
exists for type variable T with
-        // upper bounds org.apache.wss4j.stax.securityToken.UsernameSecurityToken,
-        // org.apache.wss4j.stax.securityToken.UsernameSecurityToken,
-        // org.apache.xml.security.stax.ext.securityToken.InboundSecurityToken
-        //works fine on jdk 1.7
         final UsernameSecurityToken usernameSecurityToken =
-                usernameTokenValidator.</*fake @see above*/UsernameSecurityTokenImpl>
-                        validate(usernameTokenType, tokenContext);
+                usernameTokenValidator.validate(usernameTokenType, tokenContext);
 
         SecurityTokenProvider<InboundSecurityToken> securityTokenProvider =
                 new SecurityTokenProvider<InboundSecurityToken>() {



Mime
View raw message