[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Oct 14 20:56:46 2014
New Revision: 6704

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6704&view=rev
Log:
Eliminate unavoidable warnings on unused settings.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML1ScopedStringAttributeEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ScopedStringAttributeEncoder.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML1ScopedStringAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML1ScopedStringAttributeEncoder.java?rev=6704&r1=6703&r2=6704&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML1ScopedStringAttributeEncoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML1ScopedStringAttributeEncoder.java Tue Oct 14 20:56:46 2014
@@ -138,15 +138,9 @@
                 throw new ComponentInitializationException(
                         "Encoder of type \"attribute\" must specify a scope attribute name");
             }
-            if (null != getScopeDelimiter()) {
-                log.warn("Scope delimiter {} not valid for type \"attribute\"", getScopeDelimiter());
-            }
         } else if ("inline".equals(getScopeType())) {
             if (null == getScopeDelimiter()) {
                 throw new ComponentInitializationException("Encoder of type \"inline\" must specify a scope delimiter");
-            }
-            if (null != getScopeAttributeName()) {
-                log.warn("Scope attribute name {} not valid for type \"inline\"", getScopeAttributeName());
             }
         } else {
             throw new ComponentInitializationException("Encoder scope type must be set to \"inline\" or \"attribute\"");

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ScopedStringAttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ScopedStringAttributeEncoder.java?rev=6704&r1=6703&r2=6704&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ScopedStringAttributeEncoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2ScopedStringAttributeEncoder.java Tue Oct 14 20:56:46 2014
@@ -147,15 +147,9 @@
                 throw new ComponentInitializationException(
                         "Encoder of type \"attribute\" must specify a scope attribute name");
             }
-            if (null != getScopeDelimiter()) {
-                log.warn("Scope delimiter {} not valid for type \"attribute\"", getScopeDelimiter());
-            }
         } else if ("inline".equals(getScopeType())) {
             if (null == getScopeDelimiter()) {
                 throw new ComponentInitializationException("Encoder of type \"inline\" must specify a scope delimiter");
-            }
-            if (null != getScopeAttributeName()) {
-                log.warn("Scope attribute name {} not valid for type \"inline\"", getScopeAttributeName());
             }
         } else {
             throw new ComponentInitializationException("Encoder scope type must be set to \"inline\" or \"attribute\"");