[java-shib-attribute] branch main updated: Checkstyle.
Codeberg
noreply at shibboleth.net
Wed Aug 26 16:59:16 UTC 2026
This is an automated email from the git hooks/post-receive script.
codeberg pushed a commit to branch main
in repository java-shib-attribute.
View the commit online:
https://codeberg.org/Shibboleth/java-shib-attribute/commit/3412bd9897ea4cb4ae6c85d35d42f2f5fb5c1a3f
The following commit(s) were added to refs/heads/main by this push:
new 3412bd989 Checkstyle.
3412bd989 is described below
commit 3412bd9897ea4cb4ae6c85d35d42f2f5fb5c1a3f
Author: Scott Cantor <scott at restingparrotsoftware.com>
AuthorDate: Wed Aug 26 12:59:02 2026 -0400
Checkstyle.
---
.../java/net/shibboleth/idp/attribute/IdPAttribute.java | 6 ++++--
.../net/shibboleth/idp/attribute/AttributeContextTest.java | 3 +--
.../shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java | 6 +++---
.../resolver/ad/impl/DateTimeAttributeDefinition.java | 4 +++-
.../attribute/resolver/dc/http/impl/HTTPDataConnector.java | 8 ++++----
.../resolver/dc/impl/AbstractSearchDataConnector.java | 3 ++-
.../resolver/dc/saml/util/impl/SubjectMatchProcessor.java | 1 +
.../dc/storage/impl/StorageServiceDataConnector.java | 4 ++--
.../idp/attribute/resolver/impl/AttributeResolverImpl.java | 12 ++++++++----
.../resolver/spring/BaseResolverPluginParser.java | 14 +++++++-------
.../spring/dc/impl/ScriptedDataConnectorParser.java | 10 ++++++----
11 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
index 8fe83919e..bdb24bb69 100644
--- a/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
+++ b/shib-attribute-api/src/main/java/net/shibboleth/idp/attribute/IdPAttribute.java
@@ -185,8 +185,10 @@ public class IdPAttribute implements Comparable<IdPAttribute>, Cloneable {
/** {@inheritDoc}
*
- * Note that for historic reasons IdPAttribute equality is based only on the Identifier (the values are no looked at)
- * See JSATTR-45 for why.
+ * Note that for historic reasons IdPAttribute equality is based only on the Identifier
+ * (the values are no looked at).
+ *
+ * <p>See JSATTR-45 for why.</p>
*/
@Override
public boolean equals(final Object obj) {
diff --git a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
index 0f82af552..38be05f26 100644
--- a/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
+++ b/shib-attribute-api/src/test/java/net/shibboleth/idp/attribute/AttributeContextTest.java
@@ -29,7 +29,7 @@ import net.shibboleth.shared.collection.CollectionSupport;
/** Unit test for {@link AttributeContext} class. */
- at SuppressWarnings( "removal" )
+ at SuppressWarnings({"removal","javadoc"})
public class AttributeContextTest {
/**
@@ -49,7 +49,6 @@ public class AttributeContextTest {
}
}
- @SuppressWarnings("javadoc")
@Test public void attributeContext() {
AttributeContext context = new AttributeContext();
diff --git a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
index 46fc69982..a8ff30319 100644
--- a/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
+++ b/shib-attribute-impl/src/main/java/net/shibboleth/idp/attribute/impl/JDBCPairwiseIdStore.java
@@ -958,9 +958,9 @@ public class JDBCPairwiseIdStore extends AbstractInitializableComponent implemen
private boolean isRolledBack;
/** Constructor.
- * @param autoCommit what to set {@link Connection#setAutoCommit(boolean)} ti
- * @param writeLock if we are also arbitrating table access (as per {@link JDBCPairwiseIdStore#setLocalLocking(boolean)})
- * is this a shared or exclusive lock
+ * @param autoCommit what to set {@link Connection#setAutoCommit(boolean)} to
+ * @param writeLock if we are also arbitrating table access
+ * (as per {@link JDBCPairwiseIdStore#setLocalLocking(boolean)}) is this a shared or exclusive lock
* @throws SQLException if the underlying JDBC driver throws one
*/
public ConnectionWithLock(final boolean autoCommit, final boolean writeLock) throws SQLException {
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinition.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinition.java
index 4551d375f..b00022e8f 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinition.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/ad/impl/DateTimeAttributeDefinition.java
@@ -156,7 +156,9 @@ public class DateTimeAttributeDefinition extends AbstractAttributeDefinition {
ensureId());
final List<? extends IdPAttributeValue> converted = values.stream()
- .map(v -> {assert v != null; return convert(v);})
+ .map(v -> {
+ assert v != null; return convert(v);
+ })
.filter(Predicates.notNull())
.collect(CollectionSupport.nonnullCollector(Collectors.toUnmodifiableList()))
.get();
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnector.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnector.java
index 2b02e56e6..305df9408 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnector.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/HTTPDataConnector.java
@@ -95,11 +95,11 @@ public class HTTPDataConnector extends AbstractSearchDataConnector<HTTPSearch,HT
public void doInitialize() throws ComponentInitializationException {
try {
- super.doInitialize();
+ super.doInitialize();
- if (httpClient == null) {
- throw new ComponentInitializationException(getLogPrefix() + " HttpClient cannot be null");
- }
+ if (httpClient == null) {
+ throw new ComponentInitializationException(getLogPrefix() + " HttpClient cannot be null");
+ }
}
catch (final Exception e) {
setLastFail(Instant.now());
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
index 84bc569cb..8b3a5ae17 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/impl/AbstractSearchDataConnector.java
@@ -172,7 +172,8 @@ public abstract class AbstractSearchDataConnector<T1 extends ExecutableSearch,T2
* @throws ResolutionException thrown if there is a problem retrieving data from the data source
*/
@Nullable @Unmodifiable @NotLive protected Map<String,IdPAttribute> retrieveAttributes(
- @Nonnull final T1 executable, @Nonnull AttributeResolverWorkContext workContext) throws ResolutionException {
+ @Nonnull final T1 executable, @Nonnull AttributeResolverWorkContext workContext)
+ throws ResolutionException {
return retrieveAttributes(executable);
}
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/saml/util/impl/SubjectMatchProcessor.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/saml/util/impl/SubjectMatchProcessor.java
index 6ee4c0ca8..ae75870b1 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/saml/util/impl/SubjectMatchProcessor.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/saml/util/impl/SubjectMatchProcessor.java
@@ -72,6 +72,7 @@ public class SubjectMatchProcessor {
final List<Assertion> toRemove = new LinkedList<>();
for (final Assertion assertion : responseData.getResponse().getAssertions()) {
+ assert assertion != null;
if (! subjectMatches(assertion, querySubject)) {
final Issuer assertionIssuer = assertion.getIssuer();
log.warn("Subject of Assertion '{}' from Issuer '{}' did not match query Subject, removing",
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnector.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnector.java
index ff734e793..6c5e9695c 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnector.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/storage/impl/StorageServiceDataConnector.java
@@ -125,8 +125,8 @@ public class StorageServiceDataConnector
if (getMappingStrategy() == null) {
if (generatedAttributeID == null) {
- throw new ComponentInitializationException(
- getLogPrefix() + " No mapping strategy or generated attribute ID set");
+ throw new ComponentInitializationException(getLogPrefix()
+ + " No mapping strategy or generated attribute ID set");
}
assert generatedAttributeID != null;
setMappingStrategy(new SimpleStorageMappingStrategy(generatedAttributeID));
diff --git a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
index 7362d3a4a..c1232daf3 100644
--- a/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
+++ b/shib-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/AttributeResolverImpl.java
@@ -259,7 +259,9 @@ public class AttributeResolverImpl extends AbstractIdentifiableInitializableComp
}
}
- /** Code to replace (null) with <Not Supplied> in the log
+ /**
+ * Code to replace (null) with <Not Supplied> in the log.
+ *
* @param input an input
* @return the input or a fixed string
*/
@@ -282,9 +284,11 @@ public class AttributeResolverImpl extends AbstractIdentifiableInitializableComp
} else {
log.debug("{} Attributes requested {}", logPrefix, requestedNames);
}
- log.debug("{} Principal {}, IssuerID {}, RecipientID {}, RecipientGroupId {}",
- logPrefix, notProvidedOr(resolutionContext.getPrincipal()), notProvidedOr(resolutionContext.getAttributeIssuerID()),
- notProvidedOr(resolutionContext.getAttributeRecipientID()), notProvidedOr(resolutionContext.getAttributeRecipientGroupID()));
+ log.debug("{} Principal {}, IssuerID {}, RecipientID {}, RecipientGroupId {}", logPrefix,
+ notProvidedOr(resolutionContext.getPrincipal()),
+ notProvidedOr(resolutionContext.getAttributeIssuerID()),
+ notProvidedOr(resolutionContext.getAttributeRecipientID()),
+ notProvidedOr(resolutionContext.getAttributeRecipientGroupID()));
}
// CheckStyle: CyclomaticComplexity|MethodLength ON
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
index 9952a44ac..23ceeefc5 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/BaseResolverPluginParser.java
@@ -42,6 +42,13 @@ import net.shibboleth.shared.xml.ElementSupport;
/** Bean definition parser for a {@link net.shibboleth.idp.attribute.resolver.ResolverPlugin}. */
public abstract class BaseResolverPluginParser extends AbstractCustomBeanDefinitionParser {
+ /**
+ * Index into parser.properties for the velocityEngine.
+ * Duplicated in net.shibboleth.spring.metadata.DynamicHTTPMetadataProviderParser
+ */
+ @Nonnull protected final static String VELOCIY_ENGINE_BEAN_IDENTIFIER =
+ "net.shibboleth.idp.attribute.resolver.spring.velocityEngine.bean";
+
/** Stores class of the predicate handling the relyingParties setting. */
@Nullable private Class<? extends Predicate<?>> relyingPartyPredicateClass;
@@ -54,13 +61,6 @@ public abstract class BaseResolverPluginParser extends AbstractCustomBeanDefinit
/** Class logger. */
@Nonnull private final Logger log = LoggerFactory.getLogger(BaseResolverPluginParser.class);
- /**
- * Index into parser.properties for the velocityEngine.
- * Duplicated in net.shibboleth.spring.metadata.DynamicHTTPMetadataProviderParser
- */
- @Nonnull protected final static String VELOCIY_ENGINE_BEAN_IDENTIFIER =
- "net.shibboleth.idp.attribute.resolver.spring.velocityEngine.bean";
-
/** Constructor. */
@SuppressWarnings("unchecked")
public BaseResolverPluginParser() {
diff --git a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
index ba450ec4b..de11920af 100644
--- a/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
+++ b/shib-attribute-resolver-spring/src/main/java/net/shibboleth/idp/attribute/resolver/spring/dc/impl/ScriptedDataConnectorParser.java
@@ -60,8 +60,9 @@ public class ScriptedDataConnectorParser extends AbstractDataConnectorParser {
}
/** {@inheritDoc} */
- // Checkstyle: CyclomaticComplexity OFF
- @Override protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
+ // Checkstyle: CyclomaticComplexity|MethodLength OFF
+ @Override
+ protected void doParse(@Nonnull final Element config, @Nonnull final ParserContext parserContext,
@Nonnull final BeanDefinitionBuilder builder) {
super.doParse(config, parserContext, builder);
@@ -144,5 +145,6 @@ public class ScriptedDataConnectorParser extends AbstractDataConnectorParser {
builder.addPropertyValue("resultsCache", new CacheConfigParser(config).createCache());
}
}
- // Checkstyle: CyclomaticComplexity ON
-}
+ // Checkstyle: CyclomaticComplexity|MethodLength ON
+
+}
\ 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