[java-identity-provider COMMIT] /trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/...

[noreply at shibboleth.net]

Author: rdw
Date: Sat Apr 19 04:45:11 2014
New Revision: 5747

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5747&view=rev
Log:
Cleanup logging when no resolverId Available

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java?rev=5747&r1=5746&r2=5747&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/edu/internet2/middleware/shibboleth/common/attribute/provider/V2SAMLProfileRequestContext.java Sat Apr 19 04:45:11 2014
@@ -50,7 +50,7 @@
 
     /** The Attribute Resolution Context, used to local the Principal. */
     @Nonnull private final AttributeResolutionContext resolutionContext;
-    
+
     /** Attribute Id being resolved, if any. */
     @Nullable private final String id;
 
@@ -62,7 +62,7 @@
      */
     public V2SAMLProfileRequestContext(@Nonnull final AttributeResolutionContext attributeResolutionContext,
             @Nullable final String attributeId) {
-        
+
         resolutionContext = Constraint.isNotNull(attributeResolutionContext, "Attribute Resolution Context was null");
         id = StringSupport.trimOrNull(attributeId);
     }
@@ -70,9 +70,9 @@
     /**
      * Get the attribute ID being resolved, if available.
      * 
-     * @return  attribute ID
-     */
-    @Nullable public String getId() {
+     * @return attribute ID
+     */
+    @Nullable protected String getId() {
         return id;
     }
 
@@ -111,7 +111,7 @@
      * @return null
      */
     public SAMLObject getInboundSAMLMessage() {
-        log.error("AttributeDefinition: '{}' call unsupported method getInboundSAMLMessage", getId());
+        unsupportedMethod("getInboundSAMLMessage");
         return null;
     }
 
@@ -121,7 +121,7 @@
      * @return null
      */
     public String getInboundSAMLMessageId() {
-        log.error("AttributeDefinition: '{}' call unsupported method getInboundSAMLMessageId", getId());
+        unsupportedMethod("getInboundSAMLMessageId");
         return null;
     }
 
@@ -131,7 +131,7 @@
      * @return null
      */
     public DateTime getInboundSAMLMessageIssueInstant() {
-        log.error("AttributeDefinition: '{}' call unsupported method getInboundSAMLMessageIssueInstant", getId());
+        unsupportedMethod("getInboundSAMLMessageIssueInstant");
         return null;
     }
 
@@ -141,7 +141,7 @@
      * @return null
      */
     public String getInboundSAMLProtocol() {
-        log.error("AttributeDefinition: '{}' call unsupported method getInboundSAMLProtocol", getId());
+        unsupportedMethod("getInboundSAMLProtocol");
         return null;
     }
 
@@ -151,7 +151,7 @@
      * @return null
      */
     public EntityDescriptor getLocalEntityMetadata() {
-        log.error("AttributeDefinition: '{}' call unsupported method getLocalEntityMetadata", getId());
+        unsupportedMethod("getLocalEntityMetadata");
         return null;
     }
 
@@ -161,7 +161,7 @@
      * @return null
      */
     public QName getLocalEntityRole() {
-        log.error("AttributeDefinition: '{}' call unsupported method getLocalEntityRole", getId());
+        unsupportedMethod("getLocalEntityRole");
         return null;
     }
 
@@ -171,7 +171,7 @@
      * @return null
      */
     public RoleDescriptor getLocalEntityRoleMetadata() {
-        log.error("AttributeDefinition: '{}' call unsupported method getLocalEntityRoleMetadata", getId());
+        unsupportedMethod("getLocalEntityRoleMetadata");
         return null;
     }
 
@@ -181,7 +181,7 @@
      * @return null
      */
     public MetadataResolver getMetadataResolver() {
-        log.error("AttributeDefinition: '{}' call unsupported method getMetadataResolver", getId());
+        unsupportedMethod("getMetadataResolver");
         return null;
     }
 
@@ -191,7 +191,7 @@
      * @return null
      */
     public Object getOuboundSAMLMessageSigningCredential() {
-        log.error("AttributeDefinition: '{}' call unsupported method getOuboundSAMLMessageSigningCredential", getId());
+        unsupportedMethod("getOuboundSAMLMessageSigningCredential");
         return null;
     }
 
@@ -201,7 +201,7 @@
      * @return null
      */
     public byte[] getOutboundMessageArtifactType() {
-        log.error("AttributeDefinition: '{}' call unsupported method getOutboundMessageArtifactType", getId());

[... 712 lines stripped ...]