[java-identity-provider COMMIT] in /trunk: idp-core/src/main/java/net/shibboleth/idp/security/ReloadingAccessControlS...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Oct  4 09:06:46 2016
New Revision: 8460

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8460&view=rev
Log:
IDP-1047 add annotations

https://issues.shibboleth.net/jira/browse/IDP-1047

Found by review of our conf files.

Modified:
    trunk/idp-core/src/main/java/net/shibboleth/idp/security/ReloadingAccessControlService.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipal.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipal.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclPrincipal.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextDeclRefPrincipal.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIDPrincipal.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/NameIdentifierPrincipal.java

Modified: trunk/idp-core/src/main/java/net/shibboleth/idp/security/ReloadingAccessControlService.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-core/src/main/java/net/shibboleth/idp/security/ReloadingAccessControlService.java?rev=8460&r1=8459&r2=8460&view=diff
==============================================================================
--- trunk/idp-core/src/main/java/net/shibboleth/idp/security/ReloadingAccessControlService.java	(original)
+++ trunk/idp-core/src/main/java/net/shibboleth/idp/security/ReloadingAccessControlService.java	Tue Oct  4 09:06:46 2016
@@ -20,6 +20,7 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.security.AccessControl;
@@ -40,7 +41,7 @@
      * 
      * @param svc the embedded service
      */
-    public ReloadingAccessControlService(@Nonnull final AccessControlService svc) {
+    public ReloadingAccessControlService(@Nonnull @ParameterName(name="svc") final AccessControlService svc) {
         service = Constraint.isNotNull(svc, "AccessControlService cannot be null");
     }
 

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipal.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipal.java?rev=8460&r1=8459&r2=8460&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipal.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthenticationMethodPrincipal.java	Tue Oct  4 09:06:46 2016
@@ -20,6 +20,7 @@
 import javax.annotation.Nonnull;
 
 import net.shibboleth.idp.authn.principal.CloneablePrincipal;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
@@ -37,12 +38,13 @@
      * 
      * @param method the method URI
      */
-    public AuthenticationMethodPrincipal(@Nonnull @NotEmpty final String method) {
+    public AuthenticationMethodPrincipal(@Nonnull @NotEmpty @ParameterName(name="method") final String method) {
         authnMethod = Constraint.isNotNull(
                 StringSupport.trimOrNull(method), "AuthenticationMethod cannot be null or empty");
     }
 
     /** {@inheritDoc} */
+    @Override
     @Nonnull @NotEmpty public String getName() {
         return authnMethod;
     }
@@ -78,6 +80,7 @@
     }
 
     /** {@inheritDoc} */
+    @Override
     public AuthenticationMethodPrincipal clone() throws CloneNotSupportedException {
         final AuthenticationMethodPrincipal copy = (AuthenticationMethodPrincipal) super.clone();
         copy.authnMethod = authnMethod;

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipal.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipal.java?rev=8460&r1=8459&r2=8460&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipal.java	(original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/authn/principal/AuthnContextClassRefPrincipal.java	Tue Oct  4 09:06:46 2016
@@ -19,13 +19,14 @@
 
 import javax.annotation.Nonnull;
 
-import org.opensaml.core.xml.util.XMLObjectSupport;

[... 186 lines stripped ...]