[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Fri Sep  2 06:24:44 2016
New Revision: 8366

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8366&view=rev
Log:
Checkstyle : Mostly ReturnCount

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/AttributeSourcedSubjectCanonicalization.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractRemoteUser.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentAddress.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUserAgentIdentifier.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromBasicAuth.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractUsernamePasswordFromFormRequest.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ExtractX509CertificateFromRequest.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/PopulateMultiFactorAuthenticationContext.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/RemoteUserAuthServlet.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/SelectAuthenticationFlow.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateExternalAuthentication.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/ValidateX509Certificate.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X500SubjectCanonicalization.java
    trunk/idp-authn-impl/src/main/java/net/shibboleth/idp/authn/impl/X509AuthServlet.java
    trunk/idp-session-api/src/main/java/net/shibboleth/idp/session/AbstractIdPSession.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/PopulateSessionContext.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/ProcessLogout.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/SelectLogoutPropagationFlow.java
    trunk/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/StorageBackedIdPSession.java
    trunk/idp-ui/src/main/java/net/shibboleth/idp/ui/taglib/ServiceContactTag.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java?rev=8366&r1=8365&r2=8366&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	(original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java	Fri Sep  2 06:24:44 2016
@@ -98,10 +98,10 @@
      * @param connectors data connectors loaded in to this resolver
      * @param principalResolver code to resolve the principal
      */
-    public AttributeResolverImpl(@Nonnull @NotEmpty String resolverId,
-            @Nullable @NullableElements Collection<AttributeDefinition> definitions,
-            @Nullable @NullableElements Collection<DataConnector> connectors,
-            @Nullable LegacyPrincipalDecoder principalResolver) {
+    public AttributeResolverImpl(@Nonnull @NotEmpty final String resolverId,
+            @Nullable @NullableElements final Collection<AttributeDefinition> definitions,
+            @Nullable @NullableElements final Collection<DataConnector> connectors,
+            @Nullable final LegacyPrincipalDecoder principalResolver) {
         setId(resolverId);
 
         logPrefix = new StringBuilder("Attribute Resolver '").append(getId()).append("':").toString();
@@ -109,7 +109,7 @@
         Map<String, AttributeDefinition> checkedDefinitions;
         if (definitions != null) {
             checkedDefinitions = new HashMap<>(definitions.size());
-            for (AttributeDefinition definition : definitions) {
+            for (final AttributeDefinition definition : definitions) {
                 if (definition != null) {
                     if (checkedDefinitions.containsKey(definition.getId())) {
                         throw new IllegalArgumentException(logPrefix + " Duplicate Attribute Definition with id '"
@@ -126,7 +126,7 @@
         Map<String, DataConnector> checkedConnectors;
         if (connectors != null) {
             checkedConnectors = new HashMap<>(connectors.size());
-            for (DataConnector connector : connectors) {
+            for (final DataConnector connector : connectors) {
                 if (connector != null) {
                     if (checkedConnectors.containsKey(connector.getId())) {

[... 722 lines stripped ...]