[java-identity-provider COMMIT] in /trunk/idp-consent/src/main/java/net/shibboleth/idp/consent: flow/tou/IsTermsOfUse...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Oct 16 23:04:52 2014
New Revision: 6732

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6732&view=rev
Log:
Cleanup annotations.

Modified:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequiredPredicate.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseConsentFunction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/HashFunction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/JoinFunction.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/LocaleLookupStrategy.java

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequiredPredicate.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequiredPredicate.java?rev=6732&r1=6731&r2=6732&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequiredPredicate.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/IsTermsOfUseConsentRequiredPredicate.java Thu Oct 16 23:04:52 2014
@@ -106,7 +106,8 @@
     }
 
     /** {@inheritDoc} */
-    @Override @Nullable public boolean apply(@Nullable final ProfileRequestContext input) {
+    @Override
+    @Nullable public boolean apply(@Nullable final ProfileRequestContext input) {
         if (input == null) {
             log.debug("Terms of use consent is not required, no profile request context");
             return false;

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseConsentFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseConsentFunction.java?rev=6732&r1=6731&r2=6732&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseConsentFunction.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/tou/TermsOfUseConsentFunction.java Thu Oct 16 23:04:52 2014
@@ -29,7 +29,6 @@
 import net.shibboleth.idp.consent.logic.FlowDescriptorLookupStrategy;
 import net.shibboleth.idp.consent.logic.HashFunction;
 import net.shibboleth.idp.consent.logic.LocaleLookupStrategy;
-import net.shibboleth.utilities.java.support.annotation.constraint.NonnullAfterInit;
 
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.springframework.context.MessageSource;
@@ -56,7 +55,7 @@
     @Nonnull private Function<ProfileRequestContext, ConsentFlowDescriptor> consentFlowDescriptorLookupStrategy;
 
     /** Function used to create a hash of the terms of use text. */
-    @Nullable @NonnullAfterInit private Function<String, String> hashFunction;
+    @Nonnull private Function<String, String> hashFunction;
 
     /** Locale lookup strategy. */
     @Nonnull private Function<ProfileRequestContext, Locale> localeLookupStrategy;
@@ -72,7 +71,8 @@
     }
 
     /** {@inheritDoc} */
-    @Override public void setMessageSource(MessageSource source) {
+    @Override
+    public void setMessageSource(MessageSource source) {
         messageSource = source;
     }
 
@@ -141,6 +141,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public Map<String, Consent> apply(@Nullable final ProfileRequestContext input) {
         if (input == null) {
             return null;

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java?rev=6732&r1=6731&r2=6732&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java (original)
+++ trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/FlowDescriptorLookupStrategy.java Thu Oct 16 23:04:52 2014
@@ -59,6 +59,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nullable public T apply(ProfileRequestContext input) {
         if (input == null) {
             return null;

Modified: trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/HashFunction.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/HashFunction.java?rev=6732&r1=6731&r2=6732&view=diff
==============================================================================
--- trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/logic/HashFunction.java (original)

[... 48 lines stripped ...]