[java-identity-provider] 40/51: CheckStyle
Rod Widdowson
rdw at steadingsoftware.com
Wed Feb 6 08:43:11 EST 2019
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=c908f2b8462d0ef9ba19c47866fe826740d7785d
commit c908f2b8462d0ef9ba19c47866fe826740d7785d
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jan 27 14:41:51 2019 +0000
CheckStyle
---
.../ResolverAttributeDefinitionDependency.java | 6 ++----
.../resolver/AttributeResolverContextTest.java | 1 +
...incipalAuthenticationMethodAttributeDefinition.java | 1 +
.../resolver/ad/impl/PrescopedAtributeTest.java | 1 -
...palAuthenticationMethodAttributeDefinitionTest.java | 1 +
.../attribute/resolver/ad/impl/RegexAtributeTest.java | 1 -
.../spring/ad/BaseAttributeDefinitionParser.java | 18 +++++++-----------
.../dc/impl/BaseComputedIDDataConnectorParser.java | 16 +++++++---------
.../spring/impl/AttributeResolverNamespaceHandler.java | 5 ++---
.../ad/TemplateAttributeDefinitionParserTest.java | 8 ++++----
.../ad/TransientIdAttributeDefinitionParserTest.java | 1 -
.../spring/dc/ComputedIDDataConnectorParserTest.java | 1 -
12 files changed, 25 insertions(+), 35 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 f3ec9fd..5ccad80 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,14 +17,12 @@
package net.shibboleth.idp.attribute.resolver;
+import java.util.Objects;
+
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
-import java.util.Arrays;
-import java.util.Objects;
-
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;
diff --git a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java
index 63e42ff..7cc6748 100644
--- a/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java
+++ b/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AttributeResolverContextTest.java
@@ -27,6 +27,7 @@ import org.testng.annotations.Test;
import org.testng.collections.Lists;
/** Unit test for {@link AttributeResolutionContext}. */
+ at SuppressWarnings("deprecation")
public class AttributeResolverContextTest {
/** Test instantiation and post-instantiation state. */
diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinition.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinition.java
index aa1b3ec..6aab024 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinition.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinition.java
@@ -42,6 +42,7 @@ public class PrincipalAuthenticationMethodAttributeDefinition extends AbstractAt
private final Logger log = LoggerFactory.getLogger(PrincipalAuthenticationMethodAttributeDefinition.class);
/** {@inheritDoc} */
+ @SuppressWarnings("deprecation")
@Override @Nullable protected IdPAttribute doAttributeDefinitionResolve(
@Nonnull final AttributeResolutionContext resolutionContext,
@Nonnull final AttributeResolverWorkContext workContext) throws ResolutionException {
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
index 7ca96d8..3f5c962 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrescopedAtributeTest.java
@@ -51,7 +51,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/**
* Test for prescoped attribute definitions.
*/
- at SuppressWarnings("deprecation")
public class PrescopedAtributeTest {
/** The name. resolve to */
private static final String TEST_ATTRIBUTE_NAME = "prescoped";
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionTest.java
index d7bc63e..5538f7d 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/PrincipalAuthenticationMethodAttributeDefinitionTest.java
@@ -41,6 +41,7 @@ public class PrincipalAuthenticationMethodAttributeDefinitionTest {
Assert.assertNull(defn.resolve(TestSources.createResolutionContext("princ", "issuer", "recipient")));
}
+ @SuppressWarnings("deprecation")
@Test
public void usual() throws ComponentInitializationException, ResolutionException {
PrincipalAuthenticationMethodAttributeDefinition defn = new PrincipalAuthenticationMethodAttributeDefinition();
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
index 50b2178..da6c38f 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/RegexAtributeTest.java
@@ -52,7 +52,6 @@ import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
/**
* Test for regex attribute definitions.
*/
- at SuppressWarnings("deprecation")
public class RegexAtributeTest {
/** The name. */
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
index 276c791..5b83ed8 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/ad/BaseAttributeDefinitionParser.java
@@ -24,25 +24,21 @@ import java.util.Map;
import javax.annotation.Nonnull;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.ManagedMap;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
import net.shibboleth.ext.spring.util.SpringSupport;
import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.idp.attribute.resolver.spring.impl.InputAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.impl.InputDataConnectorParser;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.ManagedMap;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
/**
* Base spring bean definition parser for attribute definitions. AttributeDefinition implementations should provide a
* custom BeanDefinitionParser by extending this class and overriding the doParse() method to parse any additional
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.java
index a61f123..74f0160 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/BaseComputedIDDataConnectorParser.java
@@ -23,25 +23,23 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.xml.namespace.QName;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.w3c.dom.Element;
+
import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginParser;
import net.shibboleth.idp.attribute.resolver.spring.dc.AbstractDataConnectorParser;
import net.shibboleth.idp.attribute.resolver.spring.impl.AttributeResolverNamespaceHandler;
-import net.shibboleth.idp.attribute.resolver.spring.impl.InputAttributeDefinitionParser;
-import net.shibboleth.idp.attribute.resolver.spring.impl.InputDataConnectorParser;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
+import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.AttributeSupport;
import net.shibboleth.utilities.java.support.xml.DOMTypeSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.w3c.dom.Element;
-
/**
* Spring bean definition parser for configuring
* {@link net.shibboleth.idp.saml.attribute.resolver.impl.ComputedIDDataConnector} and
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
index eab45c3..e99c844 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverNamespaceHandler.java
@@ -19,8 +19,9 @@ package net.shibboleth.idp.attribute.resolver.spring.impl;
import javax.annotation.Nonnull;
+import org.springframework.beans.factory.xml.BeanDefinitionParser;
+
import net.shibboleth.ext.spring.util.BaseSpringNamespaceHandler;
-import net.shibboleth.idp.attribute.resolver.spring.BaseResolverPluginDependencyParser;
import net.shibboleth.idp.attribute.resolver.spring.ad.impl.ContextDerivedAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.ad.impl.CryptoTransientIdAttributeDefinitionParser;
import net.shibboleth.idp.attribute.resolver.spring.ad.impl.PrescopedAttributeDefinitionParser;
@@ -57,8 +58,6 @@ import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2StringNameIDEn
import net.shibboleth.idp.attribute.resolver.spring.enc.impl.SAML2XMLObjectAttributeEncoderParser;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-
/** Namespace handler for the attribute resolver. */
@SuppressWarnings("deprecation")
public class AttributeResolverNamespaceHandler extends BaseSpringNamespaceHandler {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
index d5f10bc..c5e6492 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TemplateAttributeDefinitionParserTest.java
@@ -17,18 +17,18 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
import net.shibboleth.idp.attribute.resolver.ad.impl.TemplateAttributeDefinition;
import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
import net.shibboleth.idp.attribute.resolver.spring.ad.impl.CryptoTransientIdAttributeDefinitionParser;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import org.springframework.beans.factory.BeanCreationException;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
/**
* test for {@link CryptoTransientIdAttributeDefinitionParser}
*/
+ at SuppressWarnings("deprecation")
public class TemplateAttributeDefinitionParserTest extends BaseAttributeDefinitionParserTest {
@Test(enabled = false) public void noAttr() throws ComponentInitializationException {
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
index 4bda43d..387899d 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/TransientIdAttributeDefinitionParserTest.java
@@ -17,7 +17,6 @@
package net.shibboleth.idp.attribute.resolver.spring.ad;
-import org.springframework.beans.factory.BeanCreationException;
import org.testng.Assert;
import org.testng.annotations.Test;
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
index b26a967..42efc8a 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ComputedIDDataConnectorParserTest.java
@@ -36,7 +36,6 @@ import net.shibboleth.utilities.java.support.component.ComponentInitializationEx
/**
* test for {@link ComputedIDDataConnectorParser}
*/
- at SuppressWarnings("deprecation")
public class ComputedIDDataConnectorParserTest extends BaseAttributeDefinitionParserTest {
@Test public void withSalt() throws ComponentInitializationException {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list