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

[noreply at shibboleth.net]

Author: scantor
Date: Sat Jan 31 19:02:53 2015
New Revision: 7302

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7302&view=rev
Log:
Logging cleanup, add some missing annotations.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnector.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java?rev=7302&r1=7301&r2=7302&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java Sat Jan 31 19:02:53 2015
@@ -160,7 +160,8 @@
      * 
      * @throws ResolutionException thrown if there is a problem retrieving data from the data source
      */
-    protected abstract Map<String, IdPAttribute> retrieveAttributes(final T executable) throws ResolutionException;
+    @Nullable protected abstract Map<String, IdPAttribute> retrieveAttributes(@Nonnull final T executable)
+            throws ResolutionException;
 
     /** {@inheritDoc} */
     @Override @Nullable protected Map<String, IdPAttribute> doDataConnectorResolve(

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java?rev=7302&r1=7301&r2=7302&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnector.java Sat Jan 31 19:02:53 2015
@@ -111,20 +111,17 @@
         super.doInitialize();
 
         if (connectionFactory == null) {
-            throw new ComponentInitializationException("Data connector '" + getId()
-                    + "': no connection factory was configured");
+            throw new ComponentInitializationException(getLogPrefix() + " No connection factory was configured");
         }
         if (searchExecutor == null) {
-            throw new ComponentInitializationException("Data connector '" + getId()
-                    + "': no search executor was configured");
+            throw new ComponentInitializationException(getLogPrefix() + " No search executor was configured");
         }
 
         try {
             getValidator().validate();
-        } catch (ValidationException e) {
-            log.error("Data connector '{}': invalid connector configuration", getId(), e);
-            throw new ComponentInitializationException("Data connector '" + getId()
-                    + "': invalid connector configuration", e);
+        } catch (final ValidationException e) {
+            log.error("{} Invalid connector configuration", getLogPrefix(), e);
+            throw new ComponentInitializationException(getLogPrefix() + " Invalid connector configuration", e);
         }
     }
 
@@ -141,14 +138,14 @@
             throws ResolutionException {
 
         if (filter == null) {
-            throw new ResolutionException("Search filter cannot be null");
+            throw new ResolutionException(getLogPrefix() + " Search filter cannot be null");
         }
         try {
             final SearchResult result = filter.execute(searchExecutor, connectionFactory);
-            log.trace("Data connector '{}': search returned {}", getId(), result);
+            log.trace("{} Search returned {}", getLogPrefix(), result);
             return getMappingStrategy().map(result);
-        } catch (LdapException e) {
-            throw new ResolutionException("Unable to execute LDAP search", e);
+        } catch (final LdapException e) {
+            throw new ResolutionException(getLogPrefix() + " Unable to execute LDAP search", e);
         }
     }
 
@@ -161,10 +158,10 @@
             try {
                 connection = connectionFactory.getConnection();
                 if (connection == null) {
-                    throw new LdapException("Unable to retrieve connection from connection factory");
+                    throw new LdapException(getLogPrefix() + " Unable to retrieve connection from connection factory");
                 }

[... 124 lines stripped ...]