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

[noreply at shibboleth.net]

Author: rdw
Date: Sat Dec 28 12:06:30 2013
New Revision: 5101

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5101&view=rev
Log:
Add some (eclipse inspired) annotations.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrescopedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrincipalAuthenticationMethodAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/PrincipalNameAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/RegexSplitAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML1NameIdentifierAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SAML2NameIDAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScopedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/ScriptedIdPAttribute.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/SimpleAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/StaticAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TemplateAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/TransientIdParameters.java

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java?rev=5101&r1=5100&r2=5101&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java Sat Dec 28 12:06:30 2013
@@ -47,7 +47,7 @@
 public class CryptoTransientIdAttributeDefinition extends AbstractAttributeDefinition {
 
     /** Class logger. */
-    private Logger log = LoggerFactory.getLogger(CryptoTransientIdAttributeDefinition.class);
+    private final Logger log = LoggerFactory.getLogger(CryptoTransientIdAttributeDefinition.class);
 
     /** Object used to protect and encrypt the data. */
     private DataSealer dataSealer;
@@ -56,7 +56,7 @@
     @Duration private long idLifetime;
 
     /** {@inheritDoc} */
-    protected void doInitialize() throws ComponentInitializationException {
+    @Override protected void doInitialize() throws ComponentInitializationException {
         if (0 == idLifetime) {
             log.debug("set default lifetime of 4 hours.", getLogPrefix());
             idLifetime = 1000 * 60 * 60 * 4;
@@ -64,12 +64,11 @@
         if (null == dataSealer) {
             throw new ComponentInitializationException(getLogPrefix() + " data sealer was null or unspecified");
         }
-
     }
 
     /** {@inheritDoc} */
-    @Nonnull protected IdPAttribute doAttributeDefinitionResolve(@Nonnull AttributeResolutionContext resolutionContext)
-            throws ResolutionException {
+    @Override @Nonnull protected IdPAttribute doAttributeDefinitionResolve(
+            @Nonnull final AttributeResolutionContext resolutionContext) throws ResolutionException {
 
         Constraint.isNotNull(resolutionContext, "resolution context was null");
 
@@ -100,17 +99,16 @@
         log.debug("{} Building crypto transient ID for recipient: '{}', issuer: {}, principal identifer: {}",
                 new Object[] {getLogPrefix(), attributeRecipientID, attributeIssuerID, principalName,});
 
-        StringBuilder principalTokenIdBuilder = new StringBuilder();
+        final StringBuilder principalTokenIdBuilder = new StringBuilder();
         principalTokenIdBuilder.append(attributeIssuerID).append("!").append(attributeRecipientID).append("!")
                 .append(principalName);
 
         try {
             final String transientId =

[... 1027 lines stripped ...]