Author: sguilhen(a)redhat.com Date: 2010-09-09 23:50:38 -0400 (Thu, 09 Sep 2010) New Revision: 396 Modified: federation/branches/Branch_1_x/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java federation/branches/Branch_1_x/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/SecurityActions.java federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustJAXBFactory.java federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/confighandlers/BaseSTSConfigHandler.java federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSecurityHandler.java federation/branches/Branch_1_x/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java Log: Fixed warnings Modified: federation/branches/Branch_1_x/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2010-09-10 03:50:38 UTC (rev 396) @@ -28,7 +28,6 @@ import javax.xml.bind.JAXBException; import javax.xml.crypto.MarshalException; -import javax.xml.crypto.dsig.CanonicalizationMethod; import javax.xml.crypto.dsig.DigestMethod; import javax.xml.crypto.dsig.SignatureMethod; import javax.xml.crypto.dsig.XMLSignatureException; Modified: federation/branches/Branch_1_x/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/wstrust/WSTrustClientUnitTestCase.java 2010-09-10 03:50:38 UTC (rev 396) @@ -194,7 +194,7 @@ Element token = client.issueToken(SAMLUtil.SAML2_TOKEN_TYPE); assertTrue("Token is valid" , client.validateToken(token)); - Element renewedToken = client.renewToken(SAMLUtil.SAML2_TOKEN_TYPE, token); + Element renewedToken = client.renewToken(token); System.out.println("Renewed Token=" + DocumentUtil.getNodeAsString(renewedToken)); } Modified: federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/SecurityActions.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/SecurityActions.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/SecurityActions.java 2010-09-10 03:50:38 UTC (rev 396) @@ -118,7 +118,6 @@ { return AccessController.doPrivileged( new PrivilegedAction< String >() { - @Override public String run() { return System.getProperty( key, defaultValue ); Modified: federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustJAXBFactory.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustJAXBFactory.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustJAXBFactory.java 2010-09-10 03:50:38 UTC (rev 396) @@ -180,7 +180,7 @@ try { Object object = this.binder.unmarshal(documentNode); - if (object instanceof JAXBElement) + if (object instanceof JAXBElement<?>) { JAXBElement<?> element = (JAXBElement<?>) object; if (element.getDeclaredType().equals(RequestSecurityTokenResponseCollectionType.class)) Modified: federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2010-09-10 03:50:38 UTC (rev 396) @@ -159,7 +159,7 @@ { if (obj instanceof EndpointReferenceType) reference = (EndpointReferenceType) obj; - else if (obj instanceof JAXBElement) + else if (obj instanceof JAXBElement<?>) { JAXBElement<?> element = (JAXBElement<?>) obj; if (element.getName().getLocalPart().equalsIgnoreCase("EndpointReference")) @@ -207,7 +207,7 @@ Object content = onBehalfOf.getAny(); if (content instanceof UsernameTokenType) usernameToken = (UsernameTokenType) content; - else if (content instanceof JAXBElement) + else if (content instanceof JAXBElement<?>) { JAXBElement<?> element = (JAXBElement<?>) content; if (element.getName().getLocalPart().equalsIgnoreCase("UsernameToken")) @@ -263,14 +263,13 @@ * @return a {@code byte[]} containing the secret; {@code null} if the specified entropy doesn't contain * any secret. */ - @SuppressWarnings("rawtypes") public static byte[] getBinarySecret(EntropyType entropy) { byte[] secret = null; for (Object obj : entropy.getAny()) { - JAXBElement element = (JAXBElement) obj; + JAXBElement<?> element = (JAXBElement<?>) obj; if (element.getDeclaredType().equals(BinarySecretType.class)) { BinarySecretType binarySecret = (BinarySecretType) element.getValue(); Modified: federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java 2010-09-10 03:50:38 UTC (rev 396) @@ -353,7 +353,7 @@ } } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) private void setPasswordStackingCredentials(final Builder builder) { final Map sharedState = (Map) this.sharedState; @@ -440,7 +440,7 @@ this.samlToken = samlToken; } - @SuppressWarnings({"unchecked", "rawtypes"}) + @SuppressWarnings({"unchecked"}) protected void setSharedToken(final Object token) { if (sharedState == null) Modified: federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/confighandlers/BaseSTSConfigHandler.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/confighandlers/BaseSTSConfigHandler.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/confighandlers/BaseSTSConfigHandler.java 2010-09-10 03:50:38 UTC (rev 396) @@ -36,7 +36,6 @@ { protected List<KeyValueType> options = new ArrayList<KeyValueType>(); - @Override public void setOptions(List<KeyValueType> options) { this.options.addAll( options ); Modified: federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSecurityHandler.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSecurityHandler.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSecurityHandler.java 2010-09-10 03:50:38 UTC (rev 396) @@ -206,7 +206,7 @@ return true; } - @SuppressWarnings("rawtypes") + @SuppressWarnings("unchecked") private Element extractSecurityToken(final SOAPMessageContext messageContext, final QName securityQName, final QName tokenQName) { try Modified: federation/branches/Branch_1_x/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java =================================================================== --- federation/branches/Branch_1_x/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java 2010-09-10 03:42:37 UTC (rev 395) +++ federation/branches/Branch_1_x/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/STSClientUnitTestCase.java 2010-09-10 03:50:38 UTC (rev 396) @@ -197,7 +197,7 @@ Element token = client.issueToken(SAMLUtil.SAML2_TOKEN_TYPE); assertTrue("Token is valid" , client.validateToken(token)); - Element renewedToken = client.renewToken(SAMLUtil.SAML2_TOKEN_TYPE, token); + Element renewedToken = client.renewToken(token); System.out.println("Renewed Token=" + DocumentUtil.getNodeAsString(renewedToken)); } @@ -219,7 +219,7 @@ Element token = client.issueTokenForEndpoint(endpointURI); assertTrue("Token is valid" , client.validateToken(token)); - Element renewedToken = client.renewToken(SAMLUtil.SAML2_TOKEN_TYPE, token); + Element renewedToken = client.renewToken(token); System.out.println("Renewed Token=" + DocumentUtil.getNodeAsString(renewedToken)); }