[java-shib-attribute] branch main updated: Checkstyle.
Scott Cantor
cantor.2 at osu.edu
Thu Aug 3 14:36:05 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-attribute.git;a=commit;h=7d6ce403e393b3342935ef3939f0f29d0b5a9822
The following commit(s) were added to refs/heads/main by this push:
new 7d6ce403e Checkstyle.
7d6ce403e is described below
commit 7d6ce403e393b3342935ef3939f0f29d0b5a9822
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Thu Aug 3 10:36:02 2023 -0400
Checkstyle.
---
.../spring/dc/http/impl/HTTPDataConnectorParser.java | 4 ++--
.../spring/dc/impl/ComputedIdDataConnectorParser.java | 2 +-
.../resolver/spring/dc/impl/SubjectDataConnectorParser.java | 12 ++++++------
.../spring/dc/ldap/impl/CredentialConfigFactoryBean.java | 3 ++-
.../spring/dc/ldap/impl/LDAPDataConnectorParser.java | 8 ++++----
.../spring/impl/AttributeResolverServiceStrategy.java | 3 ++-
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
index 886db0566..ef54916b2 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/http/impl/HTTPDataConnectorParser.java
@@ -64,7 +64,7 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
return HTTPDataConnector.class;
}
-// Checkstyle: CyclomaticComplexity OFF
+// Checkstyle: CyclomaticComplexity|MethodLength OFF
/** {@inheritDoc} */
@Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
@@ -139,7 +139,7 @@ public class HTTPDataConnectorParser extends AbstractDataConnectorParser {
builder.setInitMethodName("initialize");
builder.setDestroyMethodName("destroy");
}
-// Checkstyle: CyclomaticComplexity ON
+// Checkstyle: CyclomaticComplexity|MethodLength ON
/**
* Utility class for parsing v2 schema configuration.
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
index 40a97c5b0..d98a4ed2f 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ComputedIdDataConnectorParser.java
@@ -38,7 +38,7 @@ public class ComputedIdDataConnectorParser extends PairwiseIdDataConnectorParser
@Nonnull public static final QName TYPE_NAME_RESOLVER = new QName(AttributeResolverNamespaceHandler.NAMESPACE,
"ComputedId");
- /** ID of system bean used to access servlet request. */
+ /** ID of system bean used to access servlet request. */
@Nonnull @NotEmpty public static final String SERVLET_SUPPLIER_ID = "shibboleth.HttpServletRequestSupplier";
/** Class logger. */
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
index bf4c723ee..0988375f2 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/SubjectDataConnectorParser.java
@@ -52,12 +52,6 @@ public class SubjectDataConnectorParser extends AbstractDataConnectorParser {
/** Class for sourcing values from Subject(s). */
@Nullable private Class<? extends Function<?,?>> subjectDerivedClass;
-
- /** {@inheritDoc} */
- @Override
- @Nullable protected Class<? extends AbstractDataConnector> getBeanClass(@Nonnull final Element element) {
- return ContextDerivedDataConnector.class;
- }
/** Constructor. */
@SuppressWarnings("unchecked")
@@ -69,6 +63,12 @@ public class SubjectDataConnectorParser extends AbstractDataConnectorParser {
}
}
+ /** {@inheritDoc} */
+ @Override
+ @Nullable protected Class<? extends AbstractDataConnector> getBeanClass(@Nonnull final Element element) {
+ return ContextDerivedDataConnector.class;
+ }
+
/** {@inheritDoc} */
@Override
protected void doParse(@Nonnull final Element element, @Nonnull final ParserContext parserContext,
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java
index c11256114..f83cc891c 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/CredentialConfigFactoryBean.java
@@ -83,7 +83,8 @@ public class CredentialConfigFactoryBean extends AbstractComponentAwareFactoryBe
throw new BeanCreationException("Supplied StartTLSAuthenticationCredential was of wrong type");
}
}
- final CredentialConfig result = CredentialConfigFactory.createX509CredentialConfig(trustCerts, authCert, authKey);
+ final CredentialConfig result =
+ CredentialConfigFactory.createX509CredentialConfig(trustCerts, authCert, authKey);
assert result != null;
return result;
}
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
index 917e78faf..2b6cfc366 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/ldap/impl/LDAPDataConnectorParser.java
@@ -143,8 +143,8 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
}
final String connectionFactoryID = v2Parser.getBeanConnectionFactoryID();
- BeanDefinition pooledConnectionFactory;
- BeanDefinitionBuilder connectionFactory;
+ final BeanDefinition pooledConnectionFactory;
+ final BeanDefinitionBuilder connectionFactory;
if (connectionFactoryID != null) {
builder.addPropertyReference("connectionFactory", connectionFactoryID);
} else {
@@ -415,7 +415,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
}
/**
- * Get the bean ID of an externally defined Connection Factory
+ * Get the bean ID of an externally defined Connection Factory.
*
* @return Connection Factory bean ID
*/
@@ -424,7 +424,7 @@ public class LDAPDataConnectorParser extends AbstractDataConnectorParser {
}
/**
- * Get the bean ID of an externally defined Search Operation
+ * Get the bean ID of an externally defined Search Operation.
*
* @return Search Operation bean ID
*/
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
index df07f5603..e0433790a 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/impl/AttributeResolverServiceStrategy.java
@@ -64,7 +64,8 @@ public class AttributeResolverServiceStrategy extends AbstractIdentifiableInitia
}
/** {@inheritDoc} */
- @Nonnull public AbstractServiceableComponent<AttributeResolver> apply(@Nullable final ApplicationContext appContext) {
+ @Nonnull public AbstractServiceableComponent<AttributeResolver> apply(
+ @Nullable final ApplicationContext appContext) {
if (appContext == null) {
throw new ServiceException("ApplicationContext was null");
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list