[java-identity-provider] branch master updated: Checkstyle warnings
Rod Widdowson
rdw at steadingsoftware.com
Wed Jun 24 09:27:14 UTC 2020
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=d8ab6601577ad6b028bea390bec785c68ccb12d1
The following commit(s) were added to refs/heads/master by this push:
new d8ab66015 Checkstyle warnings
d8ab66015 is described below
commit d8ab6601577ad6b028bea390bec785c68ccb12d1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 24 10:25:54 2020 +0100
Checkstyle warnings
---
.../resolver/ad/impl/ScriptedAttributeTest.java | 1 -
.../dc/ldap/impl/LDAPDataConnectorTest.java | 1 +
.../resolver/dc/ldap/impl/Regressions.java | 1 +
.../dc/rdbms/impl/RDBMSDataConnectorTest.java | 1 +
.../dc/ldap/impl/LDAPDataConnectorParser.java | 2 ++
.../resolver/spring/AttributeResolverTest.java | 1 +
.../dc/http/HTTPDataConnectorParserTest.java | 1 -
.../dc/ldap/LDAPDataConnectorParserTest.java | 26 +++++++++++++---------
.../dc/rdbms/RDBMSDataConnectorParserTest.java | 1 +
.../failfast/AttributeResolverFailFastTest.java | 2 +-
10 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
index 3b07e8ffa..720d1edf9 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/ScriptedAttributeTest.java
@@ -67,7 +67,6 @@ import net.shibboleth.idp.saml.authn.principal.AuthenticationMethodPrincipal;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.collection.LazySet;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/** test for {@link net.shibboleth.idp.attribute.resolver.ad.impl.ScriptedIdPAttributeImpl}. */
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
index ed106826b..098b290aa 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/LDAPDataConnectorTest.java
@@ -67,6 +67,7 @@ import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
/**
* Tests for {@link LDAPDataConnector}
*/
+ at SuppressWarnings("javadoc")
public class LDAPDataConnectorTest {
/** The connector name. */
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
index 9c0203068..ab2d4387c 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/ldap/impl/Regressions.java
@@ -50,6 +50,7 @@ import net.shibboleth.idp.attribute.resolver.dc.ldap.StringAttributeValueMapping
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+ at SuppressWarnings("javadoc")
public class Regressions {
/** The connector name. */
diff --git a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
index e3de5bbfb..c52df37f1 100644
--- a/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
+++ b/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/dc/rdbms/impl/RDBMSDataConnectorTest.java
@@ -60,6 +60,7 @@ import net.shibboleth.utilities.java.support.velocity.VelocityEngine;
/**
* Tests for {@link RDBMSDataConnector}
*/
+ at SuppressWarnings("javadoc")
public class RDBMSDataConnectorTest {
/** The connector name. */
diff --git a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 8e3f22639..429e4edea 100644
--- a/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/idp-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -691,6 +691,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
*
* @return sasl config bean definition
*/
+ //CheckStyle: CyclomaticComplexity OFF
@Nullable protected BeanDefinition createSaslConfig() {
final List<Element> saslConfigElements = ElementSupport.getChildElementsByTagNameNS(configElement,
AttributeResolverNamespaceHandler.NAMESPACE, "SASLConfig");
@@ -752,6 +753,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
return saslConfig.getBeanDefinition();
}
+ //CheckStyle: CyclomaticComplexity ON
/**
* Create the result mapping strategy. See {@link net.shibboleth.idp.attribute.resolver.dc.MappingStrategy}.
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index 415b21224..60a22e47e 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -71,6 +71,7 @@ import net.shibboleth.utilities.java.support.service.ServiceException;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
/** A work in progress to test the attribute resolver service. */
+ at SuppressWarnings("javadoc")
public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
/** Class logger. */
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
index cd03fe53e..5b3693b1d 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/HTTPDataConnectorParserTest.java
@@ -47,7 +47,6 @@ import net.shibboleth.idp.attribute.resolver.dc.http.impl.HTTPDataConnector;
import net.shibboleth.idp.attribute.resolver.spring.dc.http.impl.HTTPDataConnectorParser;
import net.shibboleth.idp.saml.impl.TestSources;
import net.shibboleth.utilities.java.support.repository.RepositorySupport;
-import net.shibboleth.utilities.java.support.testing.TestSupport;
/** Test for {@link HTTPDataConnectorParser}. */
@SuppressWarnings("javadoc")
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
index 2d6a4a441..19805545d 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/LDAPDataConnectorParserTest.java
@@ -17,7 +17,11 @@
package net.shibboleth.idp.attribute.resolver.spring.dc.ldap;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertNull;
+import static org.testng.Assert.assertTrue;
import java.io.IOException;
import java.security.GeneralSecurityException;
@@ -30,17 +34,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import com.unboundid.asn1.ASN1OctetString;
-import com.unboundid.ldap.listener.InMemoryRequestHandler;
-import com.unboundid.ldap.listener.InMemorySASLBindHandler;
-import com.unboundid.ldap.sdk.BindResult;
-import com.unboundid.ldap.sdk.Control;
-import com.unboundid.ldap.sdk.DN;
-import com.unboundid.ldap.sdk.LDAPResult;
-import com.unboundid.ldap.sdk.ResultCode;
import org.ldaptive.BindConnectionInitializer;
import org.ldaptive.ConnectionConfig;
-import org.ldaptive.Credential;
import org.ldaptive.DefaultConnectionFactory;
import org.ldaptive.SearchExecutor;
import org.ldaptive.pool.BlockingConnectionPool;
@@ -62,17 +57,25 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.io.support.ResourcePropertySource;
-import org.testng.annotations.AfterMethod;
import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
+import com.unboundid.asn1.ASN1OctetString;
import com.unboundid.ldap.listener.InMemoryDirectoryServer;
import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig;
import com.unboundid.ldap.listener.InMemoryListenerConfig;
+import com.unboundid.ldap.listener.InMemoryRequestHandler;
+import com.unboundid.ldap.listener.InMemorySASLBindHandler;
+import com.unboundid.ldap.sdk.BindResult;
+import com.unboundid.ldap.sdk.Control;
+import com.unboundid.ldap.sdk.DN;
import com.unboundid.ldap.sdk.LDAPException;
+import com.unboundid.ldap.sdk.LDAPResult;
+import com.unboundid.ldap.sdk.ResultCode;
import com.unboundid.util.ssl.KeyStoreKeyManager;
import com.unboundid.util.ssl.SSLUtil;
import com.unboundid.util.ssl.TrustStoreTrustManager;
@@ -92,6 +95,7 @@ import net.shibboleth.idp.saml.impl.TestSources;
/** Test for {@link LDAPDataConnectorParser}. */
+ at SuppressWarnings("javadoc")
public class LDAPDataConnectorParserTest {
/** In-memory directory server. */
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
index 381a37927..f29f867e4 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RDBMSDataConnectorParserTest.java
@@ -60,6 +60,7 @@ import net.shibboleth.idp.attribute.resolver.spring.dc.rdbms.impl.RDBMSDataConne
import net.shibboleth.idp.testing.DatabaseTestingSupport;
/** Test for {@link RDBMSDataConnectorParser}. */
+ at SuppressWarnings("javadoc")
public class RDBMSDataConnectorParserTest {
public static final String INIT_FILE = "/net/shibboleth/idp/attribute/resolver/spring/dc/rdbms/RdbmsStore.sql";
diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
index 4f2903e22..5a69cd094 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/failfast/AttributeResolverFailFastTest.java
@@ -47,7 +47,7 @@ import net.shibboleth.utilities.java.support.service.ReloadableService;
import net.shibboleth.utilities.java.support.service.ServiceableComponent;
@Ignore
- at SuppressWarnings({"unchecked"})
+ at SuppressWarnings({"unchecked", "javadoc"})
public class AttributeResolverFailFastTest extends AbstractFailFastTest {
protected String getPath() {
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list