[java-identity-provider] branch master updated: Add annotations and adjust deprecation warnings.
Scott Cantor
cantor.2 at osu.edu
Wed May 10 10:36:53 EDT 2017
This is an automated email from the git hooks/post-receive script.
scantor 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=0e19f5292db7fa1a5a1e6bcb734a2748d4da08f1
The following commit(s) were added to refs/heads/master by this push:
new 0e19f52 Add annotations and adjust deprecation warnings.
0e19f52 is described below
commit 0e19f5292db7fa1a5a1e6bcb734a2748d4da08f1
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed May 10 10:32:38 2017 -0400
Add annotations and adjust deprecation warnings.
---
.../filter/impl/EntitiesDescriptorNameParser.java | 3 ++-
.../filter/impl/EntityAttributesFilterParser.java | 2 +-
.../filter/impl/EntityRoleFilterParser.java | 3 ++-
.../metadata/filter/impl/KeyAuthorityParser.java | 4 ++-
.../metadata/filter/impl/NodeProcessingParser.java | 3 ++-
.../impl/PredicateFilterDirectionFactoryBean.java | 2 +-
.../filter/impl/PredicateFilterParser.java | 3 ++-
.../filter/impl/RequiredValidUntilFactoryBean.java | 3 ++-
.../filter/impl/RequiredValidUntilParser.java | 12 +++++----
.../filter/impl/SchemaValidationParser.java | 19 +++++++-------
.../SignatureValidationCriteriaSetFactoryBean.java | 3 ++-
.../filter/impl/SignatureValidationParser.java | 29 +++++++++++-----------
12 files changed, 48 insertions(+), 38 deletions(-)
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntitiesDescriptorNameParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntitiesDescriptorNameParser.java
index c52bb8f..d7b47b4 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntitiesDescriptorNameParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntitiesDescriptorNameParser.java
@@ -17,6 +17,7 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
@@ -33,7 +34,7 @@ import org.w3c.dom.Element;
public class EntitiesDescriptorNameParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
"EntitiesDescriptorName");
/** {@inheritDoc} */
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityAttributesFilterParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityAttributesFilterParser.java
index d99fe72..ed1f3dc 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityAttributesFilterParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityAttributesFilterParser.java
@@ -50,7 +50,7 @@ import org.w3c.dom.Element;
public class EntityAttributesFilterParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
"EntityAttributes");
/** Class logger. */
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityRoleFilterParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityRoleFilterParser.java
index c2b84aa..cf037f2 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityRoleFilterParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/EntityRoleFilterParser.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
@@ -38,7 +39,7 @@ import org.w3c.dom.Element;
public class EntityRoleFilterParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
+ @Nonnull public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
"EntityRoleWhiteList");
/** {@inheritDoc} */
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/KeyAuthorityParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/KeyAuthorityParser.java
index bd0550b..8ef56c7 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/KeyAuthorityParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/KeyAuthorityParser.java
@@ -17,6 +17,7 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
@@ -33,7 +34,8 @@ import org.w3c.dom.Element;
public class KeyAuthorityParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "KeyAuthority");
+ @Nonnull public static final QName TYPE_NAME =
+ new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "KeyAuthority");
/** {@inheritDoc} */
@Override protected Class<?> getBeanClass(final Element element) {
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/NodeProcessingParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/NodeProcessingParser.java
index 2a28705..ecf400f 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/NodeProcessingParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/NodeProcessingParser.java
@@ -19,6 +19,7 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.ext.spring.util.SpringSupport;
@@ -38,7 +39,7 @@ import org.w3c.dom.Element;
public class NodeProcessingParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME =
+ @Nonnull public static final QName TYPE_NAME =
new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "NodeProcessing");
/** {@inheritDoc} */
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterDirectionFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterDirectionFactoryBean.java
index b6fc0ba..c579f30 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterDirectionFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterDirectionFactoryBean.java
@@ -30,7 +30,7 @@ import org.springframework.beans.factory.config.AbstractFactoryBean;
public class PredicateFilterDirectionFactoryBean extends AbstractFactoryBean<PredicateFilter.Direction> {
/** What we want to set the value from this should be "exclude" or "include".*/
- private final String value;
+ @Nullable private final String value;
/**
* Constructor.
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterParser.java
index c8fa6ab..896dc66 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/PredicateFilterParser.java
@@ -51,7 +51,8 @@ import com.google.common.base.Predicates;
public class PredicateFilterParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "Predicate");
+ @Nonnull public static final QName TYPE_NAME =
+ new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "Predicate");
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(PredicateFilterParser.class);
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java
index 93eda72..da830f6 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilFactoryBean.java
@@ -17,6 +17,7 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
@@ -36,7 +37,7 @@ public class RequiredValidUntilFactoryBean extends AbstractFactoryBean<RequiredV
@Nullable private String maxValidityIntervalDuration;
/** Logger. */
- private final Logger log = LoggerFactory.getLogger(RequiredValidUntilFactoryBean.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(RequiredValidUntilFactoryBean.class);
/**
* Setter for {@link #maxValidityIntervalDuration}.
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java
index 00aa060..a544cba 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/RequiredValidUntilParser.java
@@ -17,6 +17,7 @@
package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.idp.profile.spring.relyingparty.metadata.AbstractMetadataProviderParser;
@@ -35,11 +36,11 @@ import org.w3c.dom.Element;
public class RequiredValidUntilParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
- "RequiredValidUntil");
+ @Nonnull public static final QName TYPE_NAME =
+ new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "RequiredValidUntil");
- /** log */
- private Logger log = LoggerFactory.getLogger(RequiredValidUntilParser.class);
+ /** Class logger. */
+ @Nonnull private Logger log = LoggerFactory.getLogger(RequiredValidUntilParser.class);
/** {@inheritDoc} */
@Override protected Class<?> getBeanClass(final Element element) {
@@ -62,4 +63,5 @@ public class RequiredValidUntilParser extends AbstractSingleBeanDefinitionParser
@Override protected boolean shouldGenerateId() {
return true;
}
-}
+
+}
\ No newline at end of file
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
index 41e2052..e7621cb 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SchemaValidationParser.java
@@ -19,6 +19,7 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.ext.spring.util.SpringSupport;
@@ -40,15 +41,15 @@ import org.w3c.dom.Element;
public class SchemaValidationParser extends AbstractSingleBeanDefinitionParser {
/** Element name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
- "SchemaValidation");
+ @Nonnull public static final QName TYPE_NAME =
+ new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "SchemaValidation");
/** Element name for the extension Schema. */
- public static final QName EXTENSION_SCHEMA_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
- "ExtensionSchema");
+ @Nonnull public static final QName EXTENSION_SCHEMA_NAME =
+ new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "ExtensionSchema");
- /** logger. */
- private final Logger log = LoggerFactory.getLogger(SchemaValidationParser.class);
+ /** Class logger. */
+ @Nonnull private final Logger log = LoggerFactory.getLogger(SchemaValidationParser.class);
/** {@inheritDoc} */
@Override protected Class<?> getBeanClass(final Element element) {
@@ -68,8 +69,7 @@ public class SchemaValidationParser extends AbstractSingleBeanDefinitionParser {
}
if (null != schemaNameElements && !schemaNameElements.isEmpty()) {
- log.warn("Use of <ExtensionSchema> elements is deprecated."
- + " Inject a customer SAMLSchemaBuilder identified as 'shibboleth.SchemaBuilder'");
+ log.warn("The <ExtensionSchema> element is DEPRECATED and will be removed in the next major version.");
builder.addConstructorArgValue(SpringSupport.getElementTextContentAsManagedList(schemaNameElements));
}
}
@@ -78,4 +78,5 @@ public class SchemaValidationParser extends AbstractSingleBeanDefinitionParser {
@Override protected boolean shouldGenerateId() {
return true;
}
-}
+
+}
\ No newline at end of file
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationCriteriaSetFactoryBean.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationCriteriaSetFactoryBean.java
index 89a7f80..4093278 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationCriteriaSetFactoryBean.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationCriteriaSetFactoryBean.java
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.resolver.CriteriaSet;
@@ -55,7 +56,7 @@ import org.springframework.beans.factory.FactoryBean;
public class SignatureValidationCriteriaSetFactoryBean implements FactoryBean<CriteriaSet> {
/** Logger. */
- private Logger log = LoggerFactory.getLogger(SignatureValidationCriteriaSetFactoryBean.class);
+ @Nonnull private Logger log = LoggerFactory.getLogger(SignatureValidationCriteriaSetFactoryBean.class);
/** Ordered collection of {@link SignatureValidationConfiguration}. */
@Nullable private List<SignatureValidationConfiguration> signatureValidationConfigs;
diff --git a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
index 5b565ac..e233c61 100644
--- a/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
+++ b/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/filter/impl/SignatureValidationParser.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.profile.spring.relyingparty.metadata.filter.impl;
import java.util.ArrayList;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
import net.shibboleth.ext.spring.util.SpringSupport;
@@ -53,22 +54,22 @@ import org.w3c.dom.Element;
public class SignatureValidationParser extends AbstractSingleBeanDefinitionParser {
/** Schema type name. */
- public static final QName TYPE_NAME = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE,
- "SignatureValidation");
+ @Nonnull public static final QName TYPE_NAME =
+ new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "SignatureValidation");
/** Element for embedded public keys. */
- public static final QName PUBLIC_KEY = new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "PublicKey");
+ @Nonnull public static final QName PUBLIC_KEY =
+ new QName(AbstractMetadataProviderParser.METADATA_NAMESPACE, "PublicKey");
- /** Logger. */
- private final Logger log = LoggerFactory.getLogger(SignatureValidationParser.class);
+ /** Class logger. */
+ @Nonnull private final Logger log = LoggerFactory.getLogger(SignatureValidationParser.class);
/** {@inheritDoc} */
@Override protected Class getBeanClass(final Element element) {
return SignatureValidationFilter.class;
}
- // Checkstyle: CyclomaticComplexity OFF
- // Checkstyle: MethodLength OFF
+// Checkstyle: CyclomaticComplexity|MethodLength OFF
/** {@inheritDoc} */
@Override protected void doParse(final Element element, final ParserContext parserContext,
final BeanDefinitionBuilder builder) {
@@ -87,7 +88,7 @@ public class SignatureValidationParser extends AbstractSingleBeanDefinitionParse
throw new BeanCreationException("trustEngineRef and certificateFile are mutually exclusive");
}
if (trustEngines != null && !trustEngines.isEmpty()) {
- log.error("{}: trustEngineRef and Embedded <TrustEngine> are mutually exclusive", parserContext
+ log.error("{}: trustEngineRef and Embedded <TrustEngine> are mutually exclusive", parserContext
.getReaderContext().getResource().getDescription());
throw new BeanCreationException("trustEngineRef and Embedded <TrustEngine> are mutually exclusive");
}
@@ -105,7 +106,7 @@ public class SignatureValidationParser extends AbstractSingleBeanDefinitionParse
throw new BeanCreationException("certificateFile and embedded public keys are mutually exclusive");
}
if (trustEngines != null && !trustEngines.isEmpty()) {
- log.error("{}: certificateFile and Embedded <TrustEngine> are mutually exclusive", parserContext
+ log.error("{}: certificateFile and Embedded <TrustEngine> are mutually exclusive", parserContext
.getReaderContext().getResource().getDescription());
throw new BeanCreationException("Embedded <TrustEngine> and certificateFile are mutually exclusive");
}
@@ -126,8 +127,8 @@ public class SignatureValidationParser extends AbstractSingleBeanDefinitionParse
if (element.hasAttributeNS(null, "requireSignedRoot")) {
builder.addPropertyValue("requireSignedRoot", element.getAttributeNS(null, "requireSignedRoot"));
} else if (element.hasAttributeNS(null, "requireSignedMetadata")) {
- log.warn("{} Use of the attribute 'requireSignedMetadata' is deprecated, "
- + "use 'requireSignedRoot' instead",
+ log.warn("{} The 'requireSignedMetadata' attribute is DEPRECATED "
+ + "and will be removed from the next major version, use 'requireSignedRoot' instead",
parserContext.getReaderContext().getResource().getDescription());
builder.addPropertyValue("requireSignedRoot", element.getAttributeNS(null, "requireSignedMetadata"));
}
@@ -150,9 +151,7 @@ public class SignatureValidationParser extends AbstractSingleBeanDefinitionParse
}
}
-
- // Checkstyle: CyclomaticComplexity ON
- // Checkstyle: MethodLength ON
+// Checkstyle: CyclomaticComplexity|MethodLength ON
/**
* Build a trust engine and populate it with the supplied credential (definition).
@@ -237,4 +236,4 @@ public class SignatureValidationParser extends AbstractSingleBeanDefinitionParse
return true;
}
-}
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list