[java-identity-provider] branch master updated: IDP-1047 Add @ParameterName annotations as indicated by the logging
Rod Widdowson
rdw at steadingsoftware.com
Tue May 8 10:57:23 EDT 2018
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b84f04543b3044bc5242873342d187282f156bc1
The following commit(s) were added to refs/heads/master by this push:
new b84f045 IDP-1047 Add @ParameterName annotations as indicated by the logging
b84f045 is described below
commit b84f04543b3044bc5242873342d187282f156bc1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue May 8 15:56:12 2018 +0100
IDP-1047 Add @ParameterName annotations as indicated by the logging
https://issues.shibboleth.net/jira/browse/IDP-1047
---
.../ResolverAttributeDefinitionDependency.java | 4 +++-
.../resolver/ResolverDataConnectorDependency.java | 3 ++-
.../cas/service/impl/ReloadingServiceRegistry.java | 9 ++++++---
.../cas/session/impl/CASSPSessionSerializer.java | 3 ++-
.../ReloadingRelyingPartyConfigurationResolver.java | 13 +++++++------
.../NodeProcessingAttachingBeanPostProcessor.java | 18 ++++++++++--------
.../SAML1AttributeDesignatorsMapperService.java | 21 ++++++++++++---------
.../mapping/impl/SAML2AttributesMapperService.java | 20 +++++++++++---------
.../impl/ReloadingRelyingPartyMetadataProvider.java | 16 +++++++++-------
.../saml/nameid/impl/LegacyCanonicalization.java | 20 +++++++++++---------
.../saml/session/impl/SAML1SPSessionSerializer.java | 9 ++++-----
.../saml/session/impl/SAML2SPSessionSerializer.java | 3 ++-
.../session/LogoutPropagationFlowDescriptor.java | 4 +++-
.../LogoutPropagationFlowDescriptorSelector.java | 5 ++++-
.../idp/session/impl/BasicSPSessionSerializer.java | 3 ++-
15 files changed, 88 insertions(+), 63 deletions(-)
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverAttributeDefinitionDependency.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverAttributeDefinitionDependency.java
index 50e5ec3..748364f 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverAttributeDefinitionDependency.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverAttributeDefinitionDependency.java
@@ -17,6 +17,8 @@
package net.shibboleth.idp.attribute.resolver;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
+
/**
* A Dependency that references to an Attribute Definition.
*/
@@ -27,7 +29,7 @@ public final class ResolverAttributeDefinitionDependency extends ResolverPluginD
*
* @param pluginId ID of dependency
*/
- public ResolverAttributeDefinitionDependency(final String pluginId) {
+ public ResolverAttributeDefinitionDependency(@ParameterName(name="pluginId") final String pluginId) {
super(pluginId);
}
diff --git a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java
index e81f656..4ce58bb 100644
--- a/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java
+++ b/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/ResolverDataConnectorDependency.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
@@ -47,7 +48,7 @@ public final class ResolverDataConnectorDependency extends ResolverPluginDepende
*
* @param pluginId ID of dependency
*/
- public ResolverDataConnectorDependency(final String pluginId) {
+ public ResolverDataConnectorDependency(@ParameterName(name="pluginId") final String pluginId) {
super(pluginId);
allAttributes = false;
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java
index c686f23..a9d2be1 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/impl/ReloadingServiceRegistry.java
@@ -20,14 +20,16 @@ package net.shibboleth.idp.cas.service.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.idp.cas.service.Service;
import net.shibboleth.idp.cas.service.ServiceRegistry;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Service registry wrapper around a {@link net.shibboleth.utilities.java.support.service.ReloadableService}.
@@ -47,7 +49,8 @@ public class ReloadingServiceRegistry extends AbstractIdentifiableInitializableC
*
* @param delegate The service to which operations are delegated.
*/
- public ReloadingServiceRegistry(@Nonnull final ReloadableService<ServiceRegistry> delegate) {
+ public ReloadingServiceRegistry(
+ @Nonnull @ParameterName(name="delegate") final ReloadableService<ServiceRegistry> delegate) {
service = Constraint.isNotNull(delegate, "ReloadableService cannot be null");
}
diff --git a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/session/impl/CASSPSessionSerializer.java b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/session/impl/CASSPSessionSerializer.java
index dd0f371..2c340c2 100644
--- a/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/session/impl/CASSPSessionSerializer.java
+++ b/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/session/impl/CASSPSessionSerializer.java
@@ -26,6 +26,7 @@ import javax.json.stream.JsonGenerator;
import net.shibboleth.idp.session.AbstractSPSessionSerializer;
import net.shibboleth.idp.session.SPSession;
import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
@@ -46,7 +47,7 @@ public class CASSPSessionSerializer extends AbstractSPSessionSerializer {
*
* @param offset milliseconds to subtract from record expiration to establish session expiration value
*/
- public CASSPSessionSerializer(@Duration @NonNegative final long offset) {
+ public CASSPSessionSerializer(@Duration @NonNegative @ParameterName(name="offset") final long offset) {
super(offset);
}
diff --git a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
index fe81928..74b2000 100644
--- a/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
+++ b/idp-profile-impl/src/main/java/net/shibboleth/idp/relyingparty/impl/ReloadingRelyingPartyConfigurationResolver.java
@@ -24,9 +24,14 @@ import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import net.shibboleth.idp.profile.config.SecurityConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
import net.shibboleth.idp.relyingparty.RelyingPartyConfigurationResolver;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
@@ -35,10 +40,6 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Retrieves a per-relying party configuration for a given profile request based on the request context. The
* configuration is loaded via the supplied service.
@@ -62,8 +63,8 @@ public class ReloadingRelyingPartyConfigurationResolver extends AbstractIdentifi
*
* @param resolverService the service which will manage the loading.
*/
- public ReloadingRelyingPartyConfigurationResolver(
- @Nonnull final ReloadableService<RelyingPartyConfigurationResolver> resolverService) {
+ public ReloadingRelyingPartyConfigurationResolver(@Nonnull @ParameterName(name="resolverService")
+ final ReloadableService<RelyingPartyConfigurationResolver> resolverService) {
service = Constraint.isNotNull(resolverService, "RelyingParty Service cannot be null");
}
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/NodeProcessingAttachingBeanPostProcessor.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/NodeProcessingAttachingBeanPostProcessor.java
index 8f95fbd..4610805 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/NodeProcessingAttachingBeanPostProcessor.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/NodeProcessingAttachingBeanPostProcessor.java
@@ -23,13 +23,6 @@ import java.util.List;
import javax.annotation.Nullable;
-import net.shibboleth.idp.attribute.resolver.AttributeResolver;
-import net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider;
-import net.shibboleth.idp.saml.metadata.impl.AttributeMappingNodeProcessor;
-import net.shibboleth.idp.saml.security.impl.KeyAuthorityNodeProcessor;
-import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.service.ReloadableService;
-
import org.opensaml.saml.metadata.resolver.ChainingMetadataResolver;
import org.opensaml.saml.metadata.resolver.MetadataResolver;
import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
@@ -40,6 +33,14 @@ import org.opensaml.saml.metadata.resolver.filter.impl.NodeProcessingMetadataFil
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.config.BeanPostProcessor;
+import net.shibboleth.idp.attribute.resolver.AttributeResolver;
+import net.shibboleth.idp.saml.metadata.RelyingPartyMetadataProvider;
+import net.shibboleth.idp.saml.metadata.impl.AttributeMappingNodeProcessor;
+import net.shibboleth.idp.saml.security.impl.KeyAuthorityNodeProcessor;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.service.ReloadableService;
+
/**
* A {@link BeanPostProcessor} for {@link MetadataResolver} beans that ensures a {@link NodeProcessingMetadataFilter}
* containing a pair of default {@link MetadataNodeProcessor} plugins is attached.
@@ -59,7 +60,8 @@ public class NodeProcessingAttachingBeanPostProcessor implements BeanPostProcess
*
* @param service the attribute resolver we use to map attributes
*/
- public NodeProcessingAttachingBeanPostProcessor(@Nullable final ReloadableService<AttributeResolver> service) {
+ public NodeProcessingAttachingBeanPostProcessor(
+ @Nullable @ParameterName(name="service") final ReloadableService<AttributeResolver> service) {
atributeResolverService = service;
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java
index 7f67343..97587b1 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML1AttributeDesignatorsMapperService.java
@@ -23,23 +23,24 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
+import org.joda.time.DateTime;
+import org.opensaml.saml.saml1.core.AttributeDesignator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.saml.attribute.mapping.AttributesMapper;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-import org.joda.time.DateTime;
-import org.opensaml.saml.saml1.core.AttributeDesignator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-
/**
* An implementation of {@link SAML1AttributeDesignatorsMapper} for use by objects that
* can't just store a constructed mapper themselves, such as action beans.
@@ -68,7 +69,9 @@ public class SAML1AttributeDesignatorsMapperService implements AttributesMapper<
*
* @param resolverService the service for the attribute resolver we are to derive mapping info from
*/
- public SAML1AttributeDesignatorsMapperService(@Nonnull final ReloadableService<AttributeResolver> resolverService) {
+ public SAML1AttributeDesignatorsMapperService(
+ @Nonnull @ParameterName(name="resolverService")
+ final ReloadableService<AttributeResolver> resolverService) {
attributeResolverService = Constraint.isNotNull(resolverService, "AttributeResolver cannot be null");
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java
index 1151ca9..145647c 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/mapping/impl/SAML2AttributesMapperService.java
@@ -23,23 +23,24 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
+import org.joda.time.DateTime;
+import org.opensaml.saml.saml2.core.Attribute;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ArrayListMultimap;
+import com.google.common.collect.Multimap;
+
import net.shibboleth.idp.attribute.IdPAttribute;
import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.saml.attribute.mapping.AttributesMapper;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-import org.joda.time.DateTime;
-import org.opensaml.saml.saml2.core.Attribute;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.Multimap;
-
/**
* An implementation of {@link SAML2AttributesMapper} for use by objects that can't just store a constructed mapper
* themselves, such as action beans.
@@ -68,7 +69,8 @@ public class SAML2AttributesMapperService implements AttributesMapper<Attribute,
*
* @param resolverService the service for the attribute resolver we are to derive mapping info from
*/
- public SAML2AttributesMapperService(@Nonnull final ReloadableService<AttributeResolver> resolverService) {
+ public SAML2AttributesMapperService(@Nonnull @ParameterName(name="resolverService")
+ final ReloadableService<AttributeResolver> resolverService) {
attributeResolverService = Constraint.isNotNull(resolverService, "AttributeResolver cannot be null");
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java
index db97003..e544d6e 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/ReloadingRelyingPartyMetadataProvider.java
@@ -22,6 +22,13 @@ import java.util.Collections;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
+import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
+import org.opensaml.saml.saml2.metadata.EntityDescriptor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentSupport;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -30,12 +37,6 @@ import net.shibboleth.utilities.java.support.resolver.ResolverException;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
-import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
-import org.opensaml.saml.saml2.metadata.EntityDescriptor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* This class uses the service interface to implement {@link MetadataResolver}.
*
@@ -54,7 +55,8 @@ public class ReloadingRelyingPartyMetadataProvider extends AbstractIdentifiableI
*
* @param resolverService the service which will manage the loading.
*/
- public ReloadingRelyingPartyMetadataProvider(@Nonnull final ReloadableService<MetadataResolver> resolverService) {
+ public ReloadingRelyingPartyMetadataProvider(
+ @Nonnull @ParameterName(name="resolverService") final ReloadableService<MetadataResolver> resolverService) {
service = Constraint.isNotNull(resolverService, "MetadataResolver Service cannot be null");
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java
index e0200e6..b25c299 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/LegacyCanonicalization.java
@@ -23,6 +23,13 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.security.auth.Subject;
+import org.opensaml.profile.action.ActionSupport;
+import org.opensaml.profile.context.ProfileRequestContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Predicate;
+
import net.shibboleth.idp.attribute.resolver.AttributeResolver;
import net.shibboleth.idp.attribute.resolver.LegacyPrincipalDecoder;
import net.shibboleth.idp.attribute.resolver.ResolutionException;
@@ -32,17 +39,11 @@ import net.shibboleth.idp.authn.SubjectCanonicalizationException;
import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
import net.shibboleth.idp.saml.authn.principal.NameIDPrincipal;
import net.shibboleth.idp.saml.authn.principal.NameIdentifierPrincipal;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
-import org.opensaml.profile.action.ActionSupport;
-import org.opensaml.profile.context.ProfileRequestContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Predicate;
-
/**
* Action to perform C14N based on the contents of the attribute-resolver.xml file, this
* delegates the work to an {@link AttributeResolver} instance that supports the
@@ -61,7 +62,8 @@ public class LegacyCanonicalization extends AbstractSubjectCanonicalizationActio
*
* @param resolverService the service which will implement {@link LegacyPrincipalDecoder}.
*/
- public LegacyCanonicalization(@Nonnull final ReloadableService<AttributeResolver> resolverService) {
+ public LegacyCanonicalization(@Nonnull @ParameterName(name="resolverService")
+ final ReloadableService<AttributeResolver> resolverService) {
attributeResolverService = Constraint.isNotNull(resolverService, "AttributeResolver cannot be null");
}
@@ -128,7 +130,7 @@ public class LegacyCanonicalization extends AbstractSubjectCanonicalizationActio
*
* @param service the service we need to interrogate.
*/
- public ActivationCondition(final ReloadableService<AttributeResolver> service) {
+ public ActivationCondition(final @ParameterName(name="service") ReloadableService<AttributeResolver> service) {
attributeResolverService = service;
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML1SPSessionSerializer.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML1SPSessionSerializer.java
index cbfed47..33ab423 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML1SPSessionSerializer.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML1SPSessionSerializer.java
@@ -27,9 +27,8 @@ import net.shibboleth.idp.saml.session.SAML1SPSession;
import net.shibboleth.idp.session.AbstractSPSessionSerializer;
import net.shibboleth.idp.session.SPSession;
import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
/**
* A serializer for {@link SAML1SPSession} objects.
@@ -42,14 +41,14 @@ public class SAML1SPSessionSerializer extends AbstractSPSessionSerializer {
*
* @param offset milliseconds to subtract from record expiration to establish session expiration value
*/
- public SAML1SPSessionSerializer(@Duration @NonNegative final long offset) {
+ public SAML1SPSessionSerializer(@Duration @NonNegative @Nonnull @ParameterName(name="offset") final long offset) {
super(offset);
}
/** {@inheritDoc} */
@Override
- @Nonnull protected SPSession doDeserialize(@Nonnull final JsonObject obj, @Nonnull @NotEmpty final String id,
- @Duration @Positive final long creation, @Duration @Positive final long expiration) throws IOException {
+ @Nonnull protected SPSession doDeserialize(final JsonObject obj, final String id,
+ final long creation, final long expiration) throws IOException {
return new SAML1SPSession(id, creation, expiration);
}
diff --git a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML2SPSessionSerializer.java b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML2SPSessionSerializer.java
index f197cfd..3745d44 100644
--- a/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML2SPSessionSerializer.java
+++ b/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML2SPSessionSerializer.java
@@ -38,6 +38,7 @@ import net.shibboleth.idp.saml.session.SAML2SPSession;
import net.shibboleth.idp.session.AbstractSPSessionSerializer;
import net.shibboleth.idp.session.SPSession;
import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
@@ -71,7 +72,7 @@ public class SAML2SPSessionSerializer extends AbstractSPSessionSerializer {
*
* @param offset milliseconds to subtract from record expiration to establish session expiration value
*/
- public SAML2SPSessionSerializer(@Duration @NonNegative final long offset) {
+ public SAML2SPSessionSerializer(@Duration @NonNegative @ParameterName(name="offset") final long offset) {
super(offset);
parserPool = Constraint.isNotNull(XMLObjectProviderRegistrySupport.getParserPool(),
diff --git a/idp-session-api/src/main/java/net/shibboleth/idp/session/LogoutPropagationFlowDescriptor.java b/idp-session-api/src/main/java/net/shibboleth/idp/session/LogoutPropagationFlowDescriptor.java
index 2848a5c..c435b2f 100644
--- a/idp-session-api/src/main/java/net/shibboleth/idp/session/LogoutPropagationFlowDescriptor.java
+++ b/idp-session-api/src/main/java/net/shibboleth/idp/session/LogoutPropagationFlowDescriptor.java
@@ -20,6 +20,8 @@ package net.shibboleth.idp.session;
import javax.annotation.Nonnull;
import com.google.common.base.MoreObjects;
+
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -42,7 +44,7 @@ public class LogoutPropagationFlowDescriptor extends AbstractIdentifiableInitial
*
* @param type type of {@link SPSession} associated with this flow
*/
- public LogoutPropagationFlowDescriptor(final Class<? extends SPSession> type) {
+ public LogoutPropagationFlowDescriptor(@ParameterName(name="type") final Class<? extends SPSession> type) {
sessionType = Constraint.isNotNull(type, "SPSession type cannot be null");
}
diff --git a/idp-session-api/src/main/java/net/shibboleth/idp/session/logic/LogoutPropagationFlowDescriptorSelector.java b/idp-session-api/src/main/java/net/shibboleth/idp/session/logic/LogoutPropagationFlowDescriptorSelector.java
index 1a0b6f4..ac52859 100644
--- a/idp-session-api/src/main/java/net/shibboleth/idp/session/logic/LogoutPropagationFlowDescriptorSelector.java
+++ b/idp-session-api/src/main/java/net/shibboleth/idp/session/logic/LogoutPropagationFlowDescriptorSelector.java
@@ -19,14 +19,17 @@ package net.shibboleth.idp.session.logic;
import java.util.ArrayList;
import java.util.List;
+
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.Predicates;
import com.google.common.collect.Collections2;
+
import net.shibboleth.idp.session.LogoutPropagationFlowDescriptor;
import net.shibboleth.idp.session.SPSession;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -44,7 +47,7 @@ public class LogoutPropagationFlowDescriptorSelector implements Function<SPSessi
* @param flows the logout propagation flows to select from
*/
public LogoutPropagationFlowDescriptorSelector(
- @Nonnull @NonnullElements final List<LogoutPropagationFlowDescriptor> flows) {
+ @Nonnull @NonnullElements @ParameterName(name="flows") final List<LogoutPropagationFlowDescriptor> flows) {
Constraint.isNotNull(flows, "Flows cannot be null");
availableFlows = new ArrayList<>(Collections2.filter(flows, Predicates.notNull()));
diff --git a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java
index f150159..caab2f0 100644
--- a/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java
+++ b/idp-session-impl/src/main/java/net/shibboleth/idp/session/impl/BasicSPSessionSerializer.java
@@ -27,6 +27,7 @@ import net.shibboleth.idp.session.AbstractSPSessionSerializer;
import net.shibboleth.idp.session.BasicSPSession;
import net.shibboleth.idp.session.SPSession;
import net.shibboleth.utilities.java.support.annotation.Duration;
+import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NonNegative;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
@@ -42,7 +43,7 @@ public class BasicSPSessionSerializer extends AbstractSPSessionSerializer {
*
* @param offset milliseconds to subtract from record expiration to establish session expiration value
*/
- public BasicSPSessionSerializer(@Duration @NonNegative final long offset) {
+ public BasicSPSessionSerializer(@Duration @NonNegative @ParameterName(name="offset") final long offset) {
super(offset);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list