[java-identity-provider] 01/02: Fix camel casing.

[Daniel Fisher]

This is an automated email from the git hooks/post-receive script.

dfisher pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=641c93ed762d167949dba866303b7c4d73d5bcba

commit 641c93ed762d167949dba866303b7c4d73d5bcba
Author: Daniel Fisher <dfisher at vt.edu>
AuthorDate: Tue May 26 22:04:50 2020 -0400

    Fix camel casing.
    
    Sasl -> SASL.
---
 .../resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java     | 8 ++++----
 .../dc/ldap/resolver/ldap-attribute-resolver-v2-external.xml      | 2 +-
 .../spring/dc/ldap/resolver/ldap-attribute-resolver-v2-sasl.xml   | 4 ++--
 .../src/main/resources/schema/shibboleth-attribute-resolver.xsd   | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index ad1f07848..8e3f22639 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -292,7 +292,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
             if (authenticationType != null) {
                 // V4 Deprecation
                 DeprecationSupport.warn(ObjectType.ATTRIBUTE, "authenticationType", "<LDAPDirectory>",
-                    "<SaslConfig>");
+                    "<SASLConfig>");
                 final Mechanism mechanism = Mechanism.valueOf(authenticationType);
                 if ("ANONYMOUS".equals(authenticationType)) {
                     log.warn("{} Ignoring unsupported authenticationType {}. " +
@@ -693,12 +693,12 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
          */
         @Nullable protected BeanDefinition createSaslConfig() {
             final List<Element> saslConfigElements = ElementSupport.getChildElementsByTagNameNS(configElement,
-                    AttributeResolverNamespaceHandler.NAMESPACE, "SaslConfig");
+                    AttributeResolverNamespaceHandler.NAMESPACE, "SASLConfig");
 
             if (saslConfigElements.isEmpty()) {
                 return null;
             } else if (saslConfigElements.size() > 1) {
-                log.warn("{} Only one <SaslConfig> element can be specified; "+
+                log.warn("{} Only one <SASLConfig> element can be specified; "+
                         "only the first has been consulted.", getLogPrefix());
             }
             final Element saslConfigElement = saslConfigElements.get(0);
@@ -929,4 +929,4 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
             return config;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-external.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-external.xml
index 2725a345c..bf6b34838 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-external.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-external.xml
@@ -11,7 +11,7 @@
                 (uid=${resolutionContext.principal})
             ]]>
         </FilterTemplate>
-        <SaslConfig mechanism="EXTERNAL" />
+        <SASLConfig mechanism="EXTERNAL" />
     </DataConnector>
 
 </AttributeResolver>
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-sasl.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-sasl.xml
index 0f703b26e..e13c2fc95 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-sasl.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/resolver/ldap-attribute-resolver-v2-sasl.xml
@@ -13,13 +13,13 @@
                 (uid=${resolutionContext.principal})
             ]]>
         </FilterTemplate>
-        <SaslConfig mechanism="DIGEST_MD5"
+        <SASLConfig mechanism="DIGEST_MD5"
                     authorizationId="authzID"
                     realm="shibboleth.net">
             <SASLProperty name="javax.security.sasl.qop" value="AUTH-INT"/>
             <SASLProperty name="javax.security.sasl.strength" value="HIGH"/>
             <SASLProperty name="javax.security.sasl.server.authentication" value="true"/>
-        </SaslConfig>
+        </SASLConfig>
     </DataConnector>
 
 </AttributeResolver>
diff --git a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
index 53fd30562..28a2b8a56 100644
--- a/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
+++ b/idp-schema/src/main/resources/schema/shibboleth-attribute-resolver.xsd
@@ -806,7 +806,7 @@
                         </annotation>
                     </element>
                     <element name="ConnectionPool" type="resolver:LdapPoolConfigType"/>
-                    <element name="SaslConfig" type="resolver:SaslConfigType"/>
+                    <element name="SASLConfig" type="resolver:SaslConfigType"/>
                     <element name="Column" type="resolver:ColumnType"/>
                     <element name="ResultCache" type="resolver:CacheConfigType"/>
                     <element name="ResultCacheBean" type="string"/>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.