[java-identity-provider COMMIT] in /trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl: Encryp...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Sep 25 10:29:12 2016
New Revision: 8427

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8427&view=rev
Log:
Checkstyle, some missing annotations.

Modified:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java?rev=8427&r1=8426&r2=8427&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java	(original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/EncryptionCredentialsResolver.java	Sun Sep 25 10:29:12 2016
@@ -24,6 +24,7 @@
 
 import net.shibboleth.ext.spring.service.ReloadableSpringService;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -42,7 +43,7 @@
 public class EncryptionCredentialsResolver implements CredentialResolver, IdentifiableComponent {
     
     /** Logger. */
-    private Logger log = LoggerFactory.getLogger(EncryptionCredentialsResolver.class);
+    @Nonnull private Logger log = LoggerFactory.getLogger(EncryptionCredentialsResolver.class);
     
     /** The reloading resolver which is the source of the credentials. */
     @Nonnull private ReloadableSpringService<RelyingPartyConfigurationResolver> service;
@@ -55,7 +56,8 @@
      * 
      * @param resolverService the Spring service exposing the relying party configuration service
      */
-    public EncryptionCredentialsResolver(final ReloadableSpringService<RelyingPartyConfigurationResolver> resolverService) {
+    public EncryptionCredentialsResolver(
+            @Nonnull final ReloadableSpringService<RelyingPartyConfigurationResolver> resolverService) {
         service = Constraint.isNotNull(resolverService, 
                 "ReloadableSpringService for RelyingPartyConfigurationResolver cannot be null");
     }
@@ -66,7 +68,7 @@
     }
 
     /** {@inheritDoc} */
-    public void setId(@Nonnull final String componentId) {
+    public void setId(@Nonnull @NotEmpty final String componentId) {
         id = Constraint.isNotNull(StringSupport.trimOrNull(componentId), "Component ID can not be null or empty");
     }
     
@@ -107,4 +109,4 @@
         return null;
     }
 
-}
+}

Modified: trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java?rev=8427&r1=8426&r2=8427&view=diff
==============================================================================
--- trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java	(original)
+++ trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/SigningCredentialsResolver.java	Sun Sep 25 10:29:12 2016
@@ -24,6 +24,7 @@
 
 import net.shibboleth.ext.spring.service.ReloadableSpringService;
 import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
+import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -42,7 +43,7 @@
 public class SigningCredentialsResolver implements CredentialResolver, IdentifiableComponent {
     
     /** Logger. */
-    private Logger log = LoggerFactory.getLogger(SigningCredentialsResolver.class);
+    @Nonnull private Logger log = LoggerFactory.getLogger(SigningCredentialsResolver.class);
     
     /** The reloading resolver which is the source of the credentials. */
     @Nonnull private ReloadableSpringService<RelyingPartyConfigurationResolver> service;
@@ -55,7 +56,8 @@
      * 
      * @param resolverService the Spring service exposing the relying party configuration service
      */
-    public SigningCredentialsResolver(final ReloadableSpringService<RelyingPartyConfigurationResolver> resolverService) {
+    public SigningCredentialsResolver(
+            @Nonnull final ReloadableSpringService<RelyingPartyConfigurationResolver> resolverService) {
         service = Constraint.isNotNull(resolverService, 

[... 18 lines stripped ...]