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

[noreply at shibboleth.net]

Author: rdw
Date: Sun Jul 13 14:05:24 2014
New Revision: 6289

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

Modified:
    trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableService.java
    trunk/idp-profile-api/src/main/java/net/shibboleth/idp/profile/context/navigate/ResponderIdLookupFunction.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML1NameIdentifierGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGenerator.java

Modified: trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java?rev=6289&r1=6288&r2=6289&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java (original)
+++ trunk/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParser.java Sun Jul 13 14:05:24 2014
@@ -128,6 +128,7 @@
      * @param parserContext bean definition parsing context
      * @param builder to initialize
      */
+    // CheckStyle: MethodLength OFF
     protected void doParseV2(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
             @Nonnull final BeanDefinitionBuilder builder) {
 
@@ -201,6 +202,7 @@
         builder.setInitMethodName("initialize");
         builder.setDestroyMethodName("destroy");
     }
+    // CheckStyle: MethodLength ON
 
     /** Utility class for parsing v2 schema configuration. */
     protected static class V2Parser {

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java?rev=6289&r1=6288&r2=6289&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java (original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java Sun Jul 13 14:05:24 2014
@@ -60,7 +60,7 @@
 
     /** Logging configuration resource. */
     private Resource configurationResource;
-    
+
     /** Spring application context. */
     @Nullable private ApplicationContext applicationContext;
 
@@ -87,13 +87,13 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public void setApplicationContext(ApplicationContext context) {
         applicationContext = context;
     }
 
     /** {@inheritDoc} */
-    @Override
-    protected synchronized boolean shouldReload() {
+    @Override protected synchronized boolean shouldReload() {
         try {
             final DateTime lastReload = getLastSuccessfulReloadInstant();
             if (null == lastReload) {
@@ -109,8 +109,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override
-    protected synchronized void doReload() throws ServiceException {
+    @Override protected synchronized void doReload() {
 
         loadLoggingConfiguration();
     }
@@ -120,7 +119,7 @@
      * 
      * @throws ServiceException thrown if there is a problem loading the logging configuration
      */
-    protected void loadLoggingConfiguration() throws ServiceException {
+    protected void loadLoggingConfiguration() {
         InputStream ins = null;
         try {
             statusManager.add(new InfoStatus("Loading new logging configuration resource: "
@@ -159,6 +158,7 @@
             }
         }
     }
+
     // Checkstyle: EmtpyBlock ON
 
     /**
@@ -169,7 +169,7 @@
      * 
      * @throws ServiceException thrown is there is a problem loading the logging configuration
      */
-    protected void loadLoggingConfiguration(InputStream loggingConfig) throws ServiceException {
+    protected void loadLoggingConfiguration(InputStream loggingConfig) {
         try {
             loggerContext.reset();
             loadIdPHomeProperty();
@@ -202,8 +202,7 @@
     }
 
     /** {@inheritDoc} */
-    @Override
-    protected void doInitialize() throws ComponentInitializationException {
+    @Override protected void doInitialize() throws ComponentInitializationException {
         if (configurationResource == null) {
             throw new ComponentInitializationException("Logging configuration must be specified.");
         }
@@ -222,10 +221,10 @@
 
     }
 
-    /** {@inheritDoc}.

[... 146 lines stripped ...]