[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SamlMessageSecur...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Nov  4 00:11:44 2013
New Revision: 3496

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3496&view=rev
Log:
Warning and annotation cleanup.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SamlMessageSecuritySupport.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SamlMessageSecuritySupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SamlMessageSecuritySupport.java?rev=3496&r1=3495&r2=3496&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SamlMessageSecuritySupport.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/SamlMessageSecuritySupport.java Mon Nov  4 00:11:44 2013
@@ -67,7 +67,7 @@
         if (outboundSAML instanceof SignableSAMLObject && parameters != null) {
             SignableSAMLObject signableMessage = (SignableSAMLObject) outboundSAML;
 
-            XMLObjectBuilder<Signature> signatureBuilder = 
+            XMLObjectBuilder<Signature> signatureBuilder = (XMLObjectBuilder<Signature>)
                     XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME);
             Signature signature = signatureBuilder.buildObject(Signature.DEFAULT_ELEMENT_NAME);
             

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java?rev=3496&r1=3495&r2=3496&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/keyinfo/KeyInfoSupport.java Mon Nov  4 00:11:44 2013
@@ -130,7 +130,7 @@
     public static void addKeyName(@Nonnull final KeyInfo keyInfo, @Nullable final String keyNameValue) {
         Constraint.isNotNull(keyInfo, "KeyInfo cannot be null");
 
-        XMLObjectBuilder<KeyName> keyNameBuilder =
+        XMLObjectBuilder<KeyName> keyNameBuilder = (XMLObjectBuilder<KeyName>)
                 XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(KeyName.DEFAULT_ELEMENT_NAME);
         KeyName keyName = Constraint.isNotNull(keyNameBuilder, "KeyName builder not available").buildObject(
                 KeyName.DEFAULT_ELEMENT_NAME);
@@ -302,7 +302,7 @@
         
         X509Data x509Data;
         if (keyInfo.getX509Datas().size() == 0) {
-            XMLObjectBuilder<X509Data> x509DataBuilder =
+            XMLObjectBuilder<X509Data> x509DataBuilder = (XMLObjectBuilder<X509Data>)
                     XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(X509Data.DEFAULT_ELEMENT_NAME);
             x509Data = Constraint.isNotNull(x509DataBuilder, "X509Data builder not available").buildObject(
                     X509Data.DEFAULT_ELEMENT_NAME);
@@ -327,7 +327,7 @@
         
         X509Data x509Data;
         if (keyInfo.getX509Datas().size() == 0) {
-            XMLObjectBuilder<X509Data> x509DataBuilder =
+            XMLObjectBuilder<X509Data> x509DataBuilder = (XMLObjectBuilder<X509Data>)
                     XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(X509Data.DEFAULT_ELEMENT_NAME);
             x509Data = Constraint.isNotNull(x509DataBuilder, "X509Data builder not available").buildObject(
                     X509Data.DEFAULT_ELEMENT_NAME);
@@ -352,7 +352,8 @@
         Constraint.isNotNull(cert, "X.509 certificate cannot be null");
         
         XMLObjectBuilder<org.opensaml.xmlsec.signature.X509Certificate> xmlCertBuilder =
-                XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
+                (XMLObjectBuilder<org.opensaml.xmlsec.signature.X509Certificate>)
+                    XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
                         org.opensaml.xmlsec.signature.X509Certificate.DEFAULT_ELEMENT_NAME);
         org.opensaml.xmlsec.signature.X509Certificate xmlCert =
                 Constraint.isNotNull(xmlCertBuilder, "X509Certificate builder not available").buildObject(
@@ -375,7 +376,8 @@
         Constraint.isNotNull(crl, "X.509 CRL cannot be null");
         
         XMLObjectBuilder<org.opensaml.xmlsec.signature.X509CRL> xmlCRLBuilder =
-                XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
+                (XMLObjectBuilder<org.opensaml.xmlsec.signature.X509CRL>)
+                    XMLObjectProviderRegistrySupport.getBuilderFactory().getBuilder(
                         org.opensaml.xmlsec.signature.X509CRL.DEFAULT_ELEMENT_NAME);
         org.opensaml.xmlsec.signature.X509CRL xmlCRL =

[... 123 lines stripped ...]