[java-oidc-common] branch main updated: Null cleanup in tests.
Scott Cantor
cantor.2 at osu.edu
Wed Nov 8 18:38:50 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-oidc-common.
View the commit online:
http://git.shibboleth.net/view/?p=java-oidc-common.git;a=commit;h=0f76c43c099dab65bc27896f711a72aa9d20c4eb
The following commit(s) were added to refs/heads/main by this push:
new 0f76c43 Null cleanup in tests.
0f76c43 is described below
commit 0f76c43c099dab65bc27896f711a72aa9d20c4eb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Nov 8 13:38:47 2023 -0500
Null cleanup in tests.
---
.../cache/impl/BatchMetadataCacheTest.java | 39 +++++++++--------
...ultOIDCProviderMetadataParsingStrategyTest.java | 10 ++---
.../cache/impl/DynamicMetadataCacheTest.java | 25 +++++++----
.../cache/impl/FetchThroughMetadataCacheTest.java | 9 ++--
.../ManuallyTriggeredScheduledExecutorService.java | 4 +-
.../cache/impl/MetadataCacheBuilderTest.java | 21 ++++++----
.../MetadataPolicyLookupStrategyFactoryTest.java | 13 +++---
.../oidc/metadata/cache/impl/ScheduledTask.java | 12 +-----
.../impl/BaseClientSecretValueResolverTest.java | 5 ++-
.../impl/ChainingProviderMetadataResolverTest.java | 5 +--
.../impl/ClientInformationNodeProcessorTest.java | 1 +
.../impl/DefaultFileLoadingStrategyTest.java | 1 +
.../FilesystemClientInformationResolverTest.java | 5 ++-
...PProviderConfigurationFetchingStrategyTest.java | 7 ++--
.../metadata/impl/OIDCMapMetadataResolverTest.java | 15 ++++---
.../impl/OIDCProviderMetadataResolverTest.java | 24 +++++------
.../PropertiesClientSecretValueResolverTest.java | 8 +---
...solverServiceClientSecretValueResolverTest.java | 39 +++++++----------
...StorageServiceClientInformationManagerTest.java | 7 ++--
.../impl/DefaultMetadataPolicyEnforcerTest.java | 7 +++-
.../impl/DefaultMetadataPolicyValidatorTest.java | 1 +
.../policy/impl/MetadataPolicyHelperTest.java | 49 +++++++++++-----------
.../impl/OIDCMetadataPolicyResolverTest.java | 1 +
...loadClientResolverServiceConfigurationTest.java | 1 +
...erMetadataResolverServiceConfigurationTest.java | 1 +
25 files changed, 155 insertions(+), 155 deletions(-)
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheTest.java
index a6c4df8..30c4401 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/BatchMetadataCacheTest.java
@@ -31,12 +31,13 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
+import javax.annotation.Nonnull;
+
import org.opensaml.core.criterion.EntityIdCriterion;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.ParseException;
import com.nimbusds.oauth2.sdk.id.Issuer;
import com.nimbusds.openid.connect.sdk.SubjectType;
@@ -48,9 +49,11 @@ import net.shibboleth.oidc.metadata.cache.MetadataCacheException;
import net.shibboleth.oidc.metadata.criterion.IssuerIDCriterion;
import net.shibboleth.oidc.metadata.impl.DefaultBatchBackingStore;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
/** Tests for the {@link BatchMetadataCache}.*/
+ at SuppressWarnings("javadoc")
public class BatchMetadataCacheTest {
private BatchMetadataCache<Issuer, OIDCProviderMetadata> cache;
@@ -67,7 +70,7 @@ public class BatchMetadataCacheTest {
defaultLoadingStrategy = new LoadingStrategy() {
@Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
try {
return new OIDCProviderMetadata(new Issuer("http://www.example.org"), List.of(SubjectType.PUBLIC),
new URI("http://www.example.org/metadata")).toJSONObject().toJSONString().getBytes();
@@ -77,7 +80,7 @@ public class BatchMetadataCacheTest {
}
@Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
};
@@ -110,8 +113,8 @@ public class BatchMetadataCacheTest {
cache.setRefreshDelayFactor(0.75f);
cache.setMetadataFilterStrategy((metadata, context) -> metadata);
- cache.setMetadataValidPredicate(Predicates.alwaysTrue());
- cache.setSourceMetadataValidPredicate(Predicates.alwaysTrue());
+ cache.setMetadataValidPredicate(PredicateSupport.alwaysTrue());
+ cache.setSourceMetadataValidPredicate(PredicateSupport.alwaysTrue());
cache.setId("MockRefreshableCache");
// Initialise when you need to use it, if creating a local version, do not init this one.
// cache.initialize();
@@ -139,7 +142,7 @@ public class BatchMetadataCacheTest {
localCache.setIdentifierExtractionStrategy(OIDCProviderMetadata::getIssuer);
localCache.setMinRefreshDelay(Duration.ofMillis(100));
localCache.setMaxRefreshDelay(Duration.ofMillis(200));
- localCache.setSourceMetadataValidPredicate(Predicates.alwaysTrue());
+ localCache.setSourceMetadataValidPredicate(PredicateSupport.alwaysTrue());
localCache.setCriteriaToIdentifierStrategy(crit -> {
final IssuerIDCriterion issuerId = crit.get(IssuerIDCriterion.class);
if (issuerId != null) {
@@ -150,7 +153,7 @@ public class BatchMetadataCacheTest {
localCache.setRefreshDelayFactor(0.75f);
localCache.setMetadataFilterStrategy((metadata, context) -> metadata);
- localCache.setMetadataValidPredicate(Predicates.alwaysTrue());
+ localCache.setMetadataValidPredicate(PredicateSupport.alwaysTrue());
localCache.setId("MockLocalRefreshableCache");
localCache.initialize();
@@ -164,12 +167,12 @@ public class BatchMetadataCacheTest {
final var simpleLoadingStrategy = new LoadingStrategy() {
@Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
return null;
}
@Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
};
@@ -197,12 +200,12 @@ public class BatchMetadataCacheTest {
final var simpleLoadingStrategy = new LoadingStrategy() {
@Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
return "".getBytes();
}
@Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
};
@@ -241,8 +244,8 @@ public class BatchMetadataCacheTest {
localCache.setRefreshDelayFactor(0.75f);
localCache.setMetadataFilterStrategy((metadata, context) -> metadata);
- localCache.setMetadataValidPredicate(Predicates.alwaysTrue());
- localCache.setSourceMetadataValidPredicate(Predicates.alwaysTrue());
+ localCache.setMetadataValidPredicate(PredicateSupport.alwaysTrue());
+ localCache.setSourceMetadataValidPredicate(PredicateSupport.alwaysTrue());
localCache.setId("MockLocalRefreshableCache");
//If no match, return all
localCache.setMatchOnIdentifierRequired(false);
@@ -264,12 +267,12 @@ public class BatchMetadataCacheTest {
cache.setLoadingStrategy(new LoadingStrategy() {
@Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
throw new RuntimeException("Could not load metadata");
}
@Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
});
@@ -371,7 +374,7 @@ public class BatchMetadataCacheTest {
@Test
public void testSourceNotValid_Success() throws ComponentInitializationException, MetadataCacheException {
- cache.setSourceMetadataValidPredicate(Predicates.alwaysFalse());
+ cache.setSourceMetadataValidPredicate(PredicateSupport.alwaysFalse());
cache.initialize();
final List<OIDCProviderMetadata> metadata =
cache.get(new CriteriaSet(new IssuerIDCriterion(new Issuer("http://www.example.org"))));
@@ -388,8 +391,8 @@ public class BatchMetadataCacheTest {
new OIDCProviderMetadata(new Issuer("http://www.example.org"), List.of(SubjectType.PUBLIC),
new URI("http://www.example.org/metadata"))));
- cache.setSourceMetadataValidPredicate(Predicates.alwaysFalse());
- cache.setMetadataValidPredicate(Predicates.alwaysFalse());
+ cache.setSourceMetadataValidPredicate(PredicateSupport.alwaysFalse());
+ cache.setMetadataValidPredicate(PredicateSupport.alwaysFalse());
cache.initialize();
final List<OIDCProviderMetadata> metadata =
cache.get(new CriteriaSet(new IssuerIDCriterion(iss)));
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DefaultOIDCProviderMetadataParsingStrategyTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DefaultOIDCProviderMetadataParsingStrategyTest.java
index 7b63b46..9b94eb5 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DefaultOIDCProviderMetadataParsingStrategyTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DefaultOIDCProviderMetadataParsingStrategyTest.java
@@ -15,7 +15,6 @@
package net.shibboleth.oidc.metadata.cache.impl;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -28,6 +27,7 @@ import com.google.common.io.ByteStreams;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
/** Test for {@link DefaultOIDCProviderMetadataParsingStrategy}.*/
+ at SuppressWarnings("javadoc")
public class DefaultOIDCProviderMetadataParsingStrategyTest {
@Test
@@ -39,7 +39,7 @@ public class DefaultOIDCProviderMetadataParsingStrategyTest {
final var metadataAsBytes = ByteStreams.toByteArray(metadata.getInputStream());
final List<OIDCProviderMetadata> metadataParsed = strategy.apply(metadataAsBytes);
- assertNotNull(metadataParsed);
+ assert metadataParsed != null;
assertEquals(metadataParsed.size(), 1);
}
@@ -50,7 +50,7 @@ public class DefaultOIDCProviderMetadataParsingStrategyTest {
final var metadataAsBytes = "bad json".getBytes(StandardCharsets.UTF_8);
final List<OIDCProviderMetadata> metadataParsed = strategy.apply(metadataAsBytes);
- assertNotNull(metadataParsed);
+ assert metadataParsed != null;
assertEquals(metadataParsed.size(), 0);
}
@@ -59,8 +59,8 @@ public class DefaultOIDCProviderMetadataParsingStrategyTest {
final var strategy = new DefaultOIDCProviderMetadataParsingStrategy();
final List<OIDCProviderMetadata> metadataParsed = strategy.apply(null);
- assertNotNull(metadataParsed);
+ assert metadataParsed != null;
assertEquals(metadataParsed.size(), 0);
}
-}
+}
\ No newline at end of file
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCacheTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCacheTest.java
index 539cfcc..03a53a6 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCacheTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/DynamicMetadataCacheTest.java
@@ -34,7 +34,6 @@ import javax.annotation.Nonnull;
import org.opensaml.core.criterion.EntityIdCriterion;
import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -49,26 +48,29 @@ import net.shibboleth.oidc.metadata.cache.MetadataCacheException;
import net.shibboleth.oidc.metadata.criterion.IssuerIDCriterion;
import net.shibboleth.oidc.metadata.impl.DefaultDynamicBackingStore;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.resolver.CriteriaSet;
/** Test for the MetadataCache. */
+ at SuppressWarnings("javadoc")
public class DynamicMetadataCacheTest {
/** Class logger. */
- private final Logger log = LoggerFactory.getLogger(DynamicMetadataCacheTest.class);
+ @Nonnull private final Logger log = LoggerFactory.getLogger(DynamicMetadataCacheTest.class);
/** The cache.*/
private DynamicMetadataCache<Issuer, OIDCProviderMetadata> cache;
/** A default fetching strategy.*/
- @Nonnull private Function<CriteriaSet, OIDCProviderMetadata> defaultFetchStrategy;
+ private Function<CriteriaSet, OIDCProviderMetadata> defaultFetchStrategy;
@BeforeMethod
void setup() throws Exception {
defaultFetchStrategy = crit -> {
try {
- final Issuer iss = crit.get(IssuerIDCriterion.class).getIssuerID();
+ final IssuerIDCriterion issuerCrit = crit.get(IssuerIDCriterion.class);
+ final Issuer iss = issuerCrit != null ? issuerCrit.getIssuerID() : null;
return new OIDCProviderMetadata(iss, List.of(SubjectType.PUBLIC),
new URI("http://example.oidc.op.org"));
} catch (final URISyntaxException e) {
@@ -124,7 +126,10 @@ public class DynamicMetadataCacheTest {
// use a cache local to this method
cacheLocal.setIdentifierExtractionStrategy(OIDCProviderMetadata::getIssuer);
cacheLocal.setMetadataExpirationTimeStrategy(ctx -> ctx.getNow().plus(Duration.ofMinutes(10)));
- cacheLocal.setCriteriaToIdentifierStrategy(crit -> crit.get(IssuerIDCriterion.class).getIssuerID());
+ cacheLocal.setCriteriaToIdentifierStrategy(crit -> {
+ final IssuerIDCriterion issuerCrit = crit.get(IssuerIDCriterion.class);
+ return issuerCrit != null ? issuerCrit.getIssuerID() : null;
+ });
//test a simple logging hook
cacheLocal.setMetadataBeforeRemovalHook((metadata, identifer) -> log.info("Before removal hook ran"));
@@ -230,7 +235,10 @@ public class DynamicMetadataCacheTest {
cacheLocal.setFetchStrategy(defaultFetchStrategy);
cacheLocal.setIdentifierExtractionStrategy(OIDCProviderMetadata::getIssuer);
cacheLocal.setMetadataExpirationTimeStrategy(ctx -> ctx.getNow().plus(Duration.ofMinutes(10)));
- cacheLocal.setCriteriaToIdentifierStrategy(crit -> crit.get(IssuerIDCriterion.class).getIssuerID());
+ cacheLocal.setCriteriaToIdentifierStrategy(crit -> {
+ final IssuerIDCriterion issuerCrit = crit.get(IssuerIDCriterion.class);
+ return issuerCrit != null ? issuerCrit.getIssuerID() : null;
+ });
// background task settings make no difference as it is manually scheduled.
cacheLocal.setCleanupTaskInterval(Duration.ofSeconds(20));
@@ -280,7 +288,7 @@ public class DynamicMetadataCacheTest {
}
- @Test(enabled = true)
+ @Test
public void testStaleMetadata_Success() throws Exception {
cache.initialize();
@@ -310,7 +318,8 @@ public class DynamicMetadataCacheTest {
cache.get(new CriteriaSet(new IssuerIDCriterion(iss)));
// should have been updated after firstUpdateTime.
- assertTrue(mgmtData.getLastUpdateTime().isAfter(firstUpdateTime));
+ final Instant lastUpdate = mgmtData.getLastUpdateTime();
+ assertTrue(lastUpdate != null && lastUpdate.isAfter(firstUpdateTime));
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCacheTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCacheTest.java
index 23091b1..8eb2505 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCacheTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/FetchThroughMetadataCacheTest.java
@@ -9,27 +9,26 @@ import java.net.URISyntaxException;
import java.util.List;
import java.util.function.Function;
-import javax.annotation.Nonnull;
-
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.id.Issuer;
import com.nimbusds.openid.connect.sdk.SubjectType;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
import net.shibboleth.oidc.metadata.cache.MetadataCacheException;
import net.shibboleth.oidc.metadata.criterion.IssuerIDCriterion;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
+ at SuppressWarnings("javadoc")
public class FetchThroughMetadataCacheTest {
/** The cache.*/
private FetchThroughMetadataCache<Issuer, OIDCProviderMetadata> cache;
/** A default fetching strategy.*/
- @Nonnull private Function<CriteriaSet, OIDCProviderMetadata> defaultFetchStrategy;
+ private Function<CriteriaSet, OIDCProviderMetadata> defaultFetchStrategy;
@BeforeMethod
void setup() throws Exception {
@@ -56,7 +55,7 @@ public class FetchThroughMetadataCacheTest {
//TODO what to do about this refresh factor when not needed?
cache.setRefreshDelayFactor(0.75f);
- cache.setMetadataValidPredicate(Predicates.alwaysTrue());
+ cache.setMetadataValidPredicate(PredicateSupport.alwaysTrue());
cache.setMetadataFilterStrategy((metadata, context) -> metadata);
cache.setId("MockCache");
// Initialise when you need to use it, if creating a local version, do not init this one.
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ManuallyTriggeredScheduledExecutorService.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ManuallyTriggeredScheduledExecutorService.java
index e872c0c..3070e89 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ManuallyTriggeredScheduledExecutorService.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ManuallyTriggeredScheduledExecutorService.java
@@ -34,8 +34,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-
/**
* This code is copied verbatim from org.apache.flink.core.testutils.ManuallyTriggeredScheduledExecutorService
@@ -63,7 +61,7 @@ public class ManuallyTriggeredScheduledExecutorService implements ScheduledExecu
// ------------------------------------------------------------------------
@Override
- public void execute(@Nonnull Runnable command) {
+ public void execute(Runnable command) {
synchronized (queuedRunnables) {
queuedRunnables.addLast(command);
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilderTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilderTest.java
index ac11d07..079c914 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilderTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataCacheBuilderTest.java
@@ -21,8 +21,8 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.time.Duration;
import java.time.Instant;
-import java.util.Collections;
-import java.util.List;
+
+import javax.annotation.Nonnull;
import org.testng.annotations.Test;
@@ -34,9 +34,11 @@ import net.shibboleth.oidc.metadata.cache.CacheLoadingContext;
import net.shibboleth.oidc.metadata.cache.LoadingStrategy;
import net.shibboleth.oidc.metadata.cache.MetadataCache;
import net.shibboleth.oidc.metadata.criterion.IssuerIDCriterion;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
/** Tests for the {@link MetadataCacheBuilder}.*/
+ at SuppressWarnings("javadoc")
public class MetadataCacheBuilderTest {
@@ -65,8 +67,9 @@ public class MetadataCacheBuilderTest {
spec.setMetadataFilterStrategy((metadata, context) -> metadata);
spec.setFetchStrategy(crit -> {
try {
- final Issuer iss = crit.get(IssuerIDCriterion.class).getIssuerID();
- return new OIDCProviderMetadata(iss, List.of(SubjectType.PUBLIC),
+ final IssuerIDCriterion issuerCrit = crit.get(IssuerIDCriterion.class);
+ final Issuer iss = issuerCrit != null ? issuerCrit.getIssuerID() : null;
+ return new OIDCProviderMetadata(iss, CollectionSupport.singletonList(SubjectType.PUBLIC),
new URI("http://op.example.org/jwk"));
} catch (final URISyntaxException e) {
return null;
@@ -102,22 +105,22 @@ public class MetadataCacheBuilderTest {
spec.setLoadingStrategy(new LoadingStrategy() {
@Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
return "test".getBytes();
}
@Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
});
spec.setParsingStrategy(bytesIn -> {
try {
- return List.of(new OIDCProviderMetadata(new Issuer("http://op.example.org"),
- List.of(SubjectType.PUBLIC),
+ return CollectionSupport.singletonList(new OIDCProviderMetadata(new Issuer("http://op.example.org"),
+ CollectionSupport.singletonList(SubjectType.PUBLIC),
new URI("http://op.example.org/jwk")));
} catch (final URISyntaxException e) {
- return Collections.emptyList();
+ return CollectionSupport.emptyList();
}
});
final MetadataCache<OIDCProviderMetadata> cache = builder.build(spec);
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataPolicyLookupStrategyFactoryTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataPolicyLookupStrategyFactoryTest.java
index ea7cdb1..4ffa079 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataPolicyLookupStrategyFactoryTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/MetadataPolicyLookupStrategyFactoryTest.java
@@ -19,9 +19,10 @@ import static org.testng.Assert.assertNotNull;
import java.io.IOException;
import java.time.Duration;
import java.time.Instant;
-import java.util.Collections;
import java.util.Map;
+import javax.annotation.Nonnull;
+
import org.springframework.context.support.GenericXmlApplicationContext;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -29,10 +30,12 @@ import org.testng.annotations.Test;
import net.shibboleth.oidc.metadata.cache.CacheLoadingContext;
import net.shibboleth.oidc.metadata.cache.LoadingStrategy;
import net.shibboleth.oidc.metadata.policy.MetadataPolicy;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.spring.util.AnnotationParameterNameDiscoverer;
/** Test for MetadataPolicyLookupStrategyFactory.*/
+ at SuppressWarnings("javadoc")
public class MetadataPolicyLookupStrategyFactoryTest {
/** Factory to test.*/
@@ -55,17 +58,15 @@ public class MetadataPolicyLookupStrategyFactoryTest {
spec.setMetadataFilterStrategy((metadata, context) -> metadata);
spec.setLoadingStrategy(new LoadingStrategy() {
- @Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
return "test".getBytes();
}
- @Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
});
- spec.setParsingStrategy(bytesIn -> Collections.emptyList());
+ spec.setParsingStrategy(bytesIn -> CollectionSupport.emptyList());
}
/* Test the factory creates the function correctly. Not throwing an exception is likely enough to test this.*/
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ScheduledTask.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ScheduledTask.java
index e17c67e..3eab7d8 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ScheduledTask.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/cache/impl/ScheduledTask.java
@@ -27,8 +27,6 @@ import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import javax.annotation.Nonnull;
-
/**
* This code is copied verbatim from org.apache.flink.core.testutils.ScheduledTask
@@ -37,6 +35,7 @@ import javax.annotation.Nonnull;
*
* @param <T> type of the result
*/
+ at SuppressWarnings("javadoc")
public class ScheduledTask<T> implements ScheduledFuture<T> {
private final Callable<T> callable;
@@ -80,38 +79,31 @@ public class ScheduledTask<T> implements ScheduledFuture<T> {
}
}
- @Override
public long getDelay(TimeUnit unit) {
return unit.convert(delay, TimeUnit.MILLISECONDS);
}
- @Override
public int compareTo(Delayed o) {
return Long.compare(getDelay(TimeUnit.MILLISECONDS), o.getDelay(TimeUnit.MILLISECONDS));
}
- @Override
public boolean cancel(boolean mayInterruptIfRunning) {
return result.cancel(mayInterruptIfRunning);
}
- @Override
public boolean isCancelled() {
return result.isCancelled();
}
- @Override
public boolean isDone() {
return result.isDone();
}
- @Override
public T get() throws InterruptedException, ExecutionException {
return result.get();
}
- @Override
- public T get(long timeout, @Nonnull TimeUnit unit)
+ public T get(long timeout, TimeUnit unit)
throws InterruptedException, ExecutionException, TimeoutException {
return result.get(timeout, unit);
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/BaseClientSecretValueResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/BaseClientSecretValueResolverTest.java
index 48bfb0f..453f9d7 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/BaseClientSecretValueResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/BaseClientSecretValueResolverTest.java
@@ -14,6 +14,8 @@
package net.shibboleth.oidc.metadata.impl;
+import javax.annotation.Nonnull;
+
import org.testng.annotations.Test;
import net.shibboleth.oidc.metadata.ClientSecretValueResolver;
@@ -29,6 +31,7 @@ import net.shibboleth.shared.resolver.ResolverException;
*
* @param <T> The implementation to be tested.
*/
+ at SuppressWarnings("javadoc")
public abstract class BaseClientSecretValueResolverTest<T extends AbstractClientSecretValueResolver> {
T resolver;
@@ -63,7 +66,7 @@ public abstract class BaseClientSecretValueResolverTest<T extends AbstractClient
resolver.resolve(buildCriteriaSet("ignored"));
}
- protected CriteriaSet buildCriteriaSet(final String secretReference) {
+ @Nonnull protected CriteriaSet buildCriteriaSet(@Nonnull final String secretReference) {
final ClientSecretReferenceCriterion criterion = new ClientSecretReferenceCriterion(secretReference);
return new CriteriaSet(criterion);
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ChainingProviderMetadataResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ChainingProviderMetadataResolverTest.java
index 8e95b12..11e26c4 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ChainingProviderMetadataResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ChainingProviderMetadataResolverTest.java
@@ -4,8 +4,6 @@ import java.io.IOException;
import java.util.Iterator;
import java.util.List;
-import javax.annotation.Nonnull;
-
import org.springframework.core.io.ClassPathResource;
import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
@@ -19,9 +17,10 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
+ at SuppressWarnings("javadoc")
public class ChainingProviderMetadataResolverTest {
- @Nonnull private ChainingProviderMetadataResolver resolver;
+ private ChainingProviderMetadataResolver resolver;
@BeforeMethod
public void setup() throws ResolverException, IOException, ComponentInitializationException {
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessorTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessorTest.java
index 07da423..0affde6 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessorTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ClientInformationNodeProcessorTest.java
@@ -72,6 +72,7 @@ import net.shibboleth.shared.xml.SchemaBuilder;
/**
* Unit tests for {@link ClientInformationNodeProcessor}.
*/
+ at SuppressWarnings("javadoc")
public class ClientInformationNodeProcessorTest extends XMLObjectBaseTestCase {
protected RoleDescriptor parseRoleDescriptor(final String mdFileName)
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/DefaultFileLoadingStrategyTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/DefaultFileLoadingStrategyTest.java
index 6a41b39..a90c20a 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/DefaultFileLoadingStrategyTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/DefaultFileLoadingStrategyTest.java
@@ -34,6 +34,7 @@ import net.shibboleth.oidc.metadata.cache.CacheLoadingException;
import net.shibboleth.oidc.metadata.cache.impl.DefaultFileLoadingStrategy;
/** Tests for the DefaultFileLoadingStrategy.*/
+ at SuppressWarnings("javadoc")
public class DefaultFileLoadingStrategyTest {
private final static String EXAMPLE_FILE_CONTENT = "test";
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/FilesystemClientInformationResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/FilesystemClientInformationResolverTest.java
index 03c414a..c890d05 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/FilesystemClientInformationResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/FilesystemClientInformationResolverTest.java
@@ -37,6 +37,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
/**
* Unit tests for {@link FilesystemClientInformationResolver}.
*/
+ at SuppressWarnings("javadoc")
public class FilesystemClientInformationResolverTest {
FilesystemClientInformationResolver resolver;
@@ -88,7 +89,7 @@ public class FilesystemClientInformationResolverTest {
initTest("/net/shibboleth/oidc/metadata/impl/oidc-client.json");
final ClientIDCriterion criterion = new ClientIDCriterion(new ClientID(clientId));
final OIDCClientInformation clientInfo = resolver.resolveSingle(new CriteriaSet(criterion));
- Assert.assertNotNull(clientInfo);
+ assert clientInfo != null;
Assert.assertEquals(clientInfo.getID().getValue(), clientId);
final Set<URI> redirectUris = clientInfo.getOIDCMetadata().getRedirectionURIs();
Assert.assertEquals(redirectUris.size(), 1);
@@ -104,7 +105,7 @@ public class FilesystemClientInformationResolverTest {
initTest("/net/shibboleth/oidc/metadata/impl/oidc-clients.json");
final ClientIDCriterion criterion = new ClientIDCriterion(new ClientID(clientId2));
final OIDCClientInformation clientInfo = resolver.resolveSingle(new CriteriaSet(criterion));
- Assert.assertNotNull(clientInfo);
+ assert clientInfo != null;
Assert.assertEquals(clientInfo.getID().getValue(), clientId2);
final Set<URI> redirectUris = clientInfo.getOIDCMetadata().getRedirectionURIs();
Assert.assertEquals(redirectUris.size(), 1);
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategyTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategyTest.java
index d1b0740..bf95a4a 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategyTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/HTTPProviderConfigurationFetchingStrategyTest.java
@@ -14,10 +14,8 @@
package net.shibboleth.oidc.metadata.impl;
-
import static org.mockito.ArgumentMatchers.any;
import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNull;
import java.io.InputStreamReader;
@@ -46,6 +44,7 @@ import net.shibboleth.oidc.metadata.impl.HTTPProviderConfigurationFetchingStrate
import net.shibboleth.shared.resolver.CriteriaSet;
/** Tests for HTTPProviderConfigurationFetchingStrategy.*/
+ at SuppressWarnings("javadoc")
public class HTTPProviderConfigurationFetchingStrategyTest {
@@ -69,7 +68,7 @@ public class HTTPProviderConfigurationFetchingStrategyTest {
final var fetchedMetadata =
strategy.apply(new CriteriaSet(new IssuerIDCriterion(new Issuer("https://op.example.com"))));
- assertNotNull(fetchedMetadata);
+ assert fetchedMetadata != null;
assertEquals(fetchedMetadata.getIssuer().getValue(), "https://op.example.com");
}
@@ -94,7 +93,7 @@ public class HTTPProviderConfigurationFetchingStrategyTest {
final var handledMetadata = responseHandler.handleResponse(httpResponse);
- assertNotNull(handledMetadata);
+ assert handledMetadata != null;
assertEquals(handledMetadata.getIssuer().getValue(), "https://op.example.com");
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCMapMetadataResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCMapMetadataResolverTest.java
index 76fb661..51ab34e 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCMapMetadataResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCMapMetadataResolverTest.java
@@ -36,7 +36,6 @@ import org.testng.annotations.Test;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.id.Issuer;
import net.shibboleth.oidc.metadata.BatchBackingStore;
@@ -46,10 +45,12 @@ import net.shibboleth.oidc.metadata.cache.impl.BatchMetadataCache;
import net.shibboleth.oidc.metadata.cache.impl.ManuallyTriggeredScheduledExecutorService;
import net.shibboleth.oidc.metadata.criterion.IssuerIDCriterion;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.ResolverException;
//TODO complete tests if we keep this.
+ at SuppressWarnings("javadoc")
public class OIDCMapMetadataResolverTest {
private final String GOOD_PROVIDER_CONFIGURATION_INFO = "{\n"
@@ -125,13 +126,11 @@ public class OIDCMapMetadataResolverTest {
final LoadingStrategy metadataLoadingStrat = new LoadingStrategy() {
- @Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
return GOOD_PROVIDER_CONFIGURATION_INFO.getBytes();
}
- @Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
};
@@ -166,8 +165,8 @@ public class OIDCMapMetadataResolverTest {
batchCache.setRefreshDelayFactor(0.75f);
batchCache.setMinRefreshDelay(Duration.ofMillis(1000));
batchCache.setMaxRefreshDelay(Duration.ofMillis(1000));
- batchCache.setMetadataValidPredicate(Predicates.alwaysTrue());
- batchCache.setSourceMetadataValidPredicate(Predicates.alwaysTrue());
+ batchCache.setMetadataValidPredicate(PredicateSupport.alwaysTrue());
+ batchCache.setSourceMetadataValidPredicate(PredicateSupport.alwaysTrue());
batchCache.setRefreshDelayFactor(0.75f);
//This needs thinking about
batchCache.setSourceMetadataExpiryStrategy(b -> Instant.now().plus(Duration.ofMinutes(5)));
@@ -199,7 +198,7 @@ public class OIDCMapMetadataResolverTest {
/* Expose the backing store with a public method.*/
@Override
- public BatchBackingStore<IdentifierType, MetadataType> getBackingStore(){
+ @Nonnull public BatchBackingStore<IdentifierType, MetadataType> getBackingStore(){
return super.getBackingStore();
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCProviderMetadataResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCProviderMetadataResolverTest.java
index 80df779..0c25d21 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCProviderMetadataResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/OIDCProviderMetadataResolverTest.java
@@ -49,7 +49,6 @@ import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import com.google.common.base.Predicates;
import com.nimbusds.oauth2.sdk.ParseException;
import com.nimbusds.oauth2.sdk.id.Issuer;
import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
@@ -66,11 +65,13 @@ import net.shibboleth.oidc.metadata.cache.impl.ManuallyTriggeredScheduledExecuto
import net.shibboleth.oidc.metadata.criterion.IssuerIDCriterion;
import net.shibboleth.oidc.metadata.impl.HTTPProviderConfigurationFetchingStrategy.OIDCProviderMetadataResponseHandler;
import net.shibboleth.shared.component.ComponentInitializationException;
+import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
import net.shibboleth.shared.resolver.Criterion;
import net.shibboleth.shared.resolver.ResolverException;
/** Tests for the {@link OIDCProviderMetadataResolver} .*/
+ at SuppressWarnings("javadoc")
public class OIDCProviderMetadataResolverTest {
private final static String GOOD_PROVIDER_CONFIGURATION_INFO = "{\n"
@@ -174,13 +175,11 @@ public class OIDCProviderMetadataResolverTest {
final LoadingStrategy metadataLoadingStrat = new LoadingStrategy() {
- @Override
- public byte[] load(final CacheLoadingContext t) {
+ public byte[] load(@Nonnull final CacheLoadingContext t) {
return GOOD_PROVIDER_CONFIGURATION_INFO.getBytes();
}
- @Override
- public String getSourceIdentifier() {
+ @Nonnull public String getSourceIdentifier() {
return "Mock loading source";
}
};
@@ -212,9 +211,9 @@ public class OIDCProviderMetadataResolverTest {
batchCache.setRefreshDelayFactor(0.75f);
batchCache.setMinRefreshDelay(Duration.ofMillis(1000));
batchCache.setMaxRefreshDelay(Duration.ofMillis(1000));
- batchCache.setSourceMetadataValidPredicate(Predicates.alwaysTrue());
+ batchCache.setSourceMetadataValidPredicate(PredicateSupport.alwaysTrue());
batchCache.setRefreshDelayFactor(0.75f);
- batchCache.setMetadataValidPredicate(Predicates.alwaysTrue());
+ batchCache.setMetadataValidPredicate(PredicateSupport.alwaysTrue());
//This needs thinking about
batchCache.setSourceMetadataExpiryStrategy(n -> Instant.now().plus(Duration.ofMinutes(5)));
@@ -260,7 +259,7 @@ public class OIDCProviderMetadataResolverTest {
dynCache.setMinCacheDuration(Duration.ofMinutes(10));
dynCache.setMaxCacheDuration(Duration.ofMinutes(20));
dynCache.setMetadataFilterStrategy((metadata, context) -> metadata);
- dynCache.setMetadataValidPredicate(Predicates.alwaysTrue());
+ dynCache.setMetadataValidPredicate(PredicateSupport.alwaysTrue());
dynCache.setId("MockDynCache");
}
@@ -293,7 +292,7 @@ public class OIDCProviderMetadataResolverTest {
*/
@Test
void testLookupFails_InvalidMetadata() throws Exception {
- dynCache.setMetadataValidPredicate(Predicates.alwaysFalse());
+ dynCache.setMetadataValidPredicate(PredicateSupport.alwaysFalse());
dynCache.initialize();
final Issuer iss = new Issuer("https://example.oidc.op.org");
@@ -359,7 +358,8 @@ public class OIDCProviderMetadataResolverTest {
dynResolver.resolve(new CriteriaSet(new IssuerIDCriterion(new Issuer("https://example.oidc.op.org"))));
assertNotNull(found);
assertTrue(found.iterator().hasNext());
- assertTrue(mgmtData.getLastUpdateTime().isAfter(firstUpdateTime));
+ final Instant lastUpdate = mgmtData.getLastUpdateTime();
+ assertTrue(lastUpdate != null && lastUpdate.isAfter(firstUpdateTime));
}
@Test
@@ -545,7 +545,7 @@ public class OIDCProviderMetadataResolverTest {
/* Expose the backing store with a public method.*/
@Override
- public DynamicBackingStore<IdentifierType, MetadataType> getBackingStore(){
+ @Nonnull public DynamicBackingStore<IdentifierType, MetadataType> getBackingStore(){
return super.getBackingStore();
}
@@ -562,7 +562,7 @@ public class OIDCProviderMetadataResolverTest {
/* Expose the backing store with a public method.*/
@Override
- public BatchBackingStore<IdentifierType, MetadataType> getBackingStore(){
+ @Nonnull public BatchBackingStore<IdentifierType, MetadataType> getBackingStore(){
return super.getBackingStore();
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/PropertiesClientSecretValueResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/PropertiesClientSecretValueResolverTest.java
index c29a259..7628d6e 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/PropertiesClientSecretValueResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/PropertiesClientSecretValueResolverTest.java
@@ -24,12 +24,12 @@ import org.testng.annotations.Test;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
-import net.shibboleth.shared.logic.ConstraintViolationException;
import net.shibboleth.shared.resolver.ResolverException;
/**
* Unit tests for {@link PropertiesClientSecretValueResolver}.
*/
+ at SuppressWarnings("javadoc")
public class PropertiesClientSecretValueResolverTest
extends BaseClientSecretValueResolverTest<PropertiesClientSecretValueResolver> {
@@ -50,12 +50,6 @@ public class PropertiesClientSecretValueResolverTest
resolver.initialize();
}
- @Test(expectedExceptions = ConstraintViolationException.class)
- public void setResource_shouldThrowIfResourceIsNul() {
- resolver = new PropertiesClientSecretValueResolver();
- resolver.setResource(null);
- }
-
@Test(expectedExceptions = UnmodifiableComponentException.class)
public void setResource_shouldThrowAfterInit() throws ComponentInitializationException {
resolver = buildResolver(true);
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ResolverServiceClientSecretValueResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ResolverServiceClientSecretValueResolverTest.java
index 9424915..7363b59 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ResolverServiceClientSecretValueResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/ResolverServiceClientSecretValueResolverTest.java
@@ -14,12 +14,11 @@
package net.shibboleth.oidc.metadata.impl;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.sql.DataSource;
import org.opensaml.core.criterion.EntityIdCriterion;
@@ -37,6 +36,7 @@ import com.unboundid.ldap.listener.InMemoryListenerConfig;
import com.unboundid.ldap.sdk.LDAPException;
import net.shibboleth.idp.attribute.resolver.AttributeResolver;
+import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.component.UnmodifiableComponentException;
import net.shibboleth.shared.logic.ConstraintViolationException;
@@ -54,6 +54,7 @@ import net.shibboleth.shared.testing.DatabaseTestingSupport;
* Based on <pre>idp-attribute-resolver-spring</pre> /
* <pre>net.shibboleth.idp.attribute.resolver.spring.AttributeResolverTest</pre>.
*/
+ at SuppressWarnings("javadoc")
public class ResolverServiceClientSecretValueResolverTest
extends BaseClientSecretValueResolverTest<ResolverServiceClientSecretValueResolver> {
@@ -61,17 +62,17 @@ public class ResolverServiceClientSecretValueResolverTest
private InMemoryDirectoryServer directoryServer;
/** LDAP initialization. */
- private static final String LDAP_INIT_FILE =
+ @Nonnull private static final String LDAP_INIT_FILE =
"src/test/resources/net/shibboleth/oidc/metadata/impl/ldapDataConnectorTest.ldif";
/** Database initialization. */
- private static final String DB_INIT_FILE = "/net/shibboleth/oidc/metadata/impl/RdbmsStore.sql";
+ @Nonnull private static final String DB_INIT_FILE = "/net/shibboleth/oidc/metadata/impl/RdbmsStore.sql";
/** Database population. */
- private static final String DB_DATA_FILE = "/net/shibboleth/oidc/metadata/impl/RdbmsData.sql";
+ @Nonnull private static final String DB_DATA_FILE = "/net/shibboleth/oidc/metadata/impl/RdbmsData.sql";
/** The resolver service configuration. */
- private static final String SERVICE_CONF_FILE = "/net/shibboleth/oidc/metadata/impl/service.xml";
+ @Nonnull private static final String SERVICE_CONF_FILE = "/net/shibboleth/oidc/metadata/impl/service.xml";
private GenericApplicationContext pendingTeardownContext = null;
@@ -133,7 +134,7 @@ public class ResolverServiceClientSecretValueResolverTest
final ConversionServiceFactoryBean service = new ConversionServiceFactoryBean();
context.setDisplayName("ApplicationContext: ");
- service.setConverters(new HashSet<>(Arrays.asList(new StringToDurationConverter())));
+ service.setConverters(new HashSet<>(CollectionSupport.singletonList(new StringToDurationConverter())));
service.afterPropertiesSet();
context.getBeanFactory().setConversionService(service.getObject());
@@ -154,34 +155,22 @@ public class ResolverServiceClientSecretValueResolverTest
resolver.initialize();
}
- @Test(expectedExceptions = ConstraintViolationException.class)
- public void setAttributeResolver_shouldThrowIfAttributeResolverIsNull() {
- resolver = new ResolverServiceClientSecretValueResolver();
- resolver.setAttributeResolver(null);
- }
-
@Test(expectedExceptions = UnmodifiableComponentException.class)
public void setAttributeResolver_shouldThrowAfterInit() throws ComponentInitializationException {
resolver = buildResolver(true);
resolver.setAttributeResolver(getResolver());
}
- @Test(expectedExceptions = ConstraintViolationException.class)
- public void setAttributeIds_shouldThrowIfAttributeIdsNull() throws ComponentInitializationException {
- resolver = new ResolverServiceClientSecretValueResolver();
- resolver.setAttributeIds(null);
- }
-
@Test(expectedExceptions = ConstraintViolationException.class)
public void setAttributeIds_shouldThrowIfAttributeIdsEmpty() throws ComponentInitializationException {
resolver = new ResolverServiceClientSecretValueResolver();
- resolver.setAttributeIds(Collections.emptyList());
+ resolver.setAttributeIds(CollectionSupport.emptyList());
}
@Test(expectedExceptions = UnmodifiableComponentException.class)
public void setAttributeIds_shouldThrowAfterInit() throws ComponentInitializationException {
resolver = buildResolver(true);
- resolver.setAttributeIds(Arrays.asList("myDBClientSecret", "myLDAPClientSecret"));
+ resolver.setAttributeIds(CollectionSupport.listOf("myDBClientSecret", "myLDAPClientSecret"));
}
@Test
@@ -194,7 +183,7 @@ public class ResolverServiceClientSecretValueResolverTest
@Test
public void resolveSingle_shouldReturnRdbmsValueWhenFound() throws ResolverException,
ComponentInitializationException {
- resolver = buildResolver(true, Arrays.asList("myDBClientSecret"));
+ resolver = buildResolver(true, CollectionSupport.singletonList("myDBClientSecret"));
Assert.assertEquals(resolver.resolveSingle(buildCriteriaSet(clientSecretKeyReferenceBoth, entityId)),
clientSecretValueRdbms);
}
@@ -202,7 +191,7 @@ public class ResolverServiceClientSecretValueResolverTest
@Test
public void resolveSingle_shouldReturnLdapValueWhenFound() throws ResolverException,
ComponentInitializationException {
- resolver = buildResolver(true, Arrays.asList("myLDAPClientSecret"));
+ resolver = buildResolver(true, CollectionSupport.singletonList("myLDAPClientSecret"));
Assert.assertEquals(resolver.resolveSingle(buildCriteriaSet(clientSecretKeyReferenceBoth, entityId)),
clientSecretValueLdap);
}
@@ -210,7 +199,7 @@ public class ResolverServiceClientSecretValueResolverTest
@Test
public void resolveSingle_shouldReturnLdapValueWhenOnlyFoundFromLdap() throws ResolverException,
ComponentInitializationException {
- resolver = buildResolver(true, Arrays.asList("myDBClientSecret", "myLDAPClientSecret"));
+ resolver = buildResolver(true, CollectionSupport.listOf("myDBClientSecret", "myLDAPClientSecret"));
Assert.assertEquals(resolver.resolveSingle(buildCriteriaSet(clientSecretKeyReferenceOnlyLdap, entityId2)),
"thePlainTextSecretValue1111111111");
}
@@ -257,7 +246,7 @@ public class ResolverServiceClientSecretValueResolverTest
@Override
protected ResolverServiceClientSecretValueResolver buildResolver(boolean init)
throws ComponentInitializationException {
- return buildResolver(init, Arrays.asList("myDBClientSecret", "myLDAPClientSecret"));
+ return buildResolver(init, CollectionSupport.listOf("myDBClientSecret", "myLDAPClientSecret"));
}
protected ResolverServiceClientSecretValueResolver buildResolver(boolean init, List<String> attributeIds)
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManagerTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManagerTest.java
index 187f52f..bc1fc85 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManagerTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/StorageServiceClientInformationManagerTest.java
@@ -33,6 +33,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
/**
* Unit tests for {@link StorageServiceClientInformationManager}.
*/
+ at SuppressWarnings("javadoc")
public class StorageServiceClientInformationManagerTest {
StorageServiceClientInformationManager manager;
@@ -77,7 +78,7 @@ public class StorageServiceClientInformationManagerTest {
final CriteriaSet criteria = initializeCriteria();
final OIDCClientInformation result = resolver.resolveSingle(criteria);
- Assert.assertNotNull(result);
+ assert result != null;
Assert.assertEquals(result.getID().getValue(), clientIdValue);
}
@@ -88,7 +89,7 @@ public class StorageServiceClientInformationManagerTest {
manager.destroyClientInformation(null);
final CriteriaSet criteria = initializeCriteria();
final OIDCClientInformation result = resolver.resolveSingle(criteria);
- Assert.assertNotNull(result);
+ assert result != null;
Assert.assertEquals(result.getID().getValue(), clientIdValue);
}
@@ -108,7 +109,7 @@ public class StorageServiceClientInformationManagerTest {
manager.storeClientInformation(clientInformation, Instant.now().plusSeconds(2), false);
final CriteriaSet criteria = initializeCriteria();
final OIDCClientInformation result = resolver.resolveSingle(criteria);
- Assert.assertNotNull(result);
+ assert result != null;
Assert.assertEquals(result.getID().getValue(), clientIdValue);
Thread.sleep(2100);
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcerTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcerTest.java
index f262623..7995b56 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcerTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyEnforcerTest.java
@@ -26,6 +26,7 @@ import net.shibboleth.shared.collection.Pair;
/**
* Unit tests for {@link DefaultMetadataPolicyEnforcer}.
*/
+ at SuppressWarnings("javadoc")
public class DefaultMetadataPolicyEnforcerTest {
DefaultMetadataPolicyEnforcer applier;
@@ -500,11 +501,13 @@ public class DefaultMetadataPolicyEnforcerTest {
}
public static void assertResultEquals(final Pair<Object, Boolean> pair, final Object expected) {
- Assert.assertTrue(pair.getSecond());
+ final Boolean flag = pair.getSecond();
+ Assert.assertTrue(flag != null && flag);
Assert.assertEquals(pair.getFirst(), expected);
}
public static void assertResultFalse(final Pair<Object, Boolean> pair) {
- Assert.assertFalse(pair.getSecond());
+ final Boolean flag = pair.getSecond();
+ Assert.assertFalse(flag != null && flag);
}
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyValidatorTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyValidatorTest.java
index bd377a3..a3acc6a 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyValidatorTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/DefaultMetadataPolicyValidatorTest.java
@@ -26,6 +26,7 @@ import net.shibboleth.oidc.metadata.policy.MetadataPolicy;
/**
* Unit tests for {@link DefaultMetadataPolicyValidator}.
*/
+ at SuppressWarnings("javadoc")
public class DefaultMetadataPolicyValidatorTest {
DefaultMetadataPolicyValidator validator;
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelperTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelperTest.java
index 2017d90..ed35e2d 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelperTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/MetadataPolicyHelperTest.java
@@ -28,6 +28,7 @@ import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Unit tests for {@link MetadataPolicyHelper}.
*/
+ at SuppressWarnings("javadoc")
public class MetadataPolicyHelperTest {
@Test
@@ -62,7 +63,7 @@ public class MetadataPolicyHelperTest {
.withSubsetOfValues(List.of("value2", "value3", "value4"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(new HashSet<Object>(merged.getSubsetOfValues()),
Set.of("value2", "value3"));
}
@@ -76,7 +77,7 @@ public class MetadataPolicyHelperTest {
.withSubsetOfValues(List.of(2, 3, 4))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getSubsetOfValues(), Collections.emptyList());
}
@@ -88,7 +89,7 @@ public class MetadataPolicyHelperTest {
final MetadataPolicy subordinate = new MetadataPolicy.Builder()
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getSubsetOfValues(), superior.getSubsetOfValues());
}
@@ -100,7 +101,7 @@ public class MetadataPolicyHelperTest {
.withSubsetOfValues(List.of("value1", "value2", "value3"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getSubsetOfValues(), subordinate.getSubsetOfValues());
}
@@ -113,7 +114,7 @@ public class MetadataPolicyHelperTest {
.withSubsetOfValues(Collections.emptyList())
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getSubsetOfValues(), Collections.emptyList());
}
@@ -126,7 +127,7 @@ public class MetadataPolicyHelperTest {
.withSubsetOfValues(List.of("value1", "value2", "value3"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getSubsetOfValues(), Collections.emptyList());
}
@@ -139,7 +140,7 @@ public class MetadataPolicyHelperTest {
.withOneOfValues(List.of("value2", "value3", "value4"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(new HashSet<Object>(merged.getOneOfValues()),
Set.of("value2", "value3"));
}
@@ -153,7 +154,7 @@ public class MetadataPolicyHelperTest {
.withOneOfValues(List.of(2, 3, 4))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getOneOfValues(), Collections.emptyList());
}
@@ -165,7 +166,7 @@ public class MetadataPolicyHelperTest {
final MetadataPolicy subordinate = new MetadataPolicy.Builder()
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getOneOfValues(), superior.getOneOfValues());
}
@@ -177,7 +178,7 @@ public class MetadataPolicyHelperTest {
.withOneOfValues(List.of("value1", "value2", "value3"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getOneOfValues(), subordinate.getOneOfValues());
}
@@ -190,7 +191,7 @@ public class MetadataPolicyHelperTest {
.withOneOfValues(Collections.emptyList())
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getOneOfValues(), Collections.emptyList());
}
@@ -203,7 +204,7 @@ public class MetadataPolicyHelperTest {
.withOneOfValues(List.of("value1", "value2", "value3"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getOneOfValues(), Collections.emptyList());
}
@@ -216,7 +217,7 @@ public class MetadataPolicyHelperTest {
.withSupersetOfValues(List.of("value2", "value3", "value4"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(new HashSet<Object>(merged.getSupersetOfValues()),
Set.of("value1", "value2", "value3", "value4"));
}
@@ -229,7 +230,7 @@ public class MetadataPolicyHelperTest {
final MetadataPolicy subordinate = new MetadataPolicy.Builder()
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(new HashSet<Object>(merged.getSupersetOfValues()),
Set.of("value1", "value2", "value3"));
}
@@ -243,7 +244,7 @@ public class MetadataPolicyHelperTest {
.withAdd("singleValue1")
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getAdd(), "singleValue1");
}
@@ -256,7 +257,7 @@ public class MetadataPolicyHelperTest {
.withAdd(2)
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(new HashSet<Object>((List<?>) merged.getAdd()),
Set.of("singleValue1", 2));
}
@@ -270,7 +271,7 @@ public class MetadataPolicyHelperTest {
.withAdd("singleValue2")
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(new HashSet<Object>((List<?>) merged.getAdd()),
Set.of("singleValue1", "singleValue2"));
}
@@ -284,7 +285,7 @@ public class MetadataPolicyHelperTest {
.withAdd(List.of("listValue1", "listValue2"))
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(new HashSet<Object>((List<?>) merged.getAdd()),
Set.of("singleValue1", "listValue1", "listValue2"));
}
@@ -298,7 +299,7 @@ public class MetadataPolicyHelperTest {
.withValue("singleValue1")
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getValue(), "singleValue1");
}
@@ -333,7 +334,7 @@ public class MetadataPolicyHelperTest {
.withDefaultValue("singleValue1")
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getDefaultValue(), "singleValue1");
}
@@ -357,7 +358,7 @@ public class MetadataPolicyHelperTest {
.withRegexp("singleValue1")
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertEquals(merged.getRegexp(), "singleValue1");
}
@@ -392,7 +393,7 @@ public class MetadataPolicyHelperTest {
.withEssential(Boolean.TRUE)
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertTrue(merged.isEssential());
}
@@ -405,7 +406,7 @@ public class MetadataPolicyHelperTest {
.withEssential(Boolean.FALSE)
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertFalse(merged.isEssential());
}
@@ -418,7 +419,7 @@ public class MetadataPolicyHelperTest {
.withEssential(Boolean.FALSE)
.build();
final MetadataPolicy merged = MetadataPolicyHelper.mergeMetadataPolicies(superior, subordinate);
- Assert.assertNotNull(merged);
+ assert merged != null;
Assert.assertTrue(merged.isEssential());
}
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/OIDCMetadataPolicyResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/OIDCMetadataPolicyResolverTest.java
index 240fa9a..bdf7463 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/OIDCMetadataPolicyResolverTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/OIDCMetadataPolicyResolverTest.java
@@ -39,6 +39,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
/**
* Unit tests for {@link OIDCMetadataPolicyResolver}.
*/
+ at SuppressWarnings("javadoc")
public class OIDCMetadataPolicyResolverTest {
OIDCMetadataPolicyResolver resolver;
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
index 93852ed..a7dea34 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadClientResolverServiceConfigurationTest.java
@@ -50,6 +50,7 @@ import net.shibboleth.shared.spring.service.ReloadableSpringService;
*
* Mostly based on <pre>net.shibboleth.idp.profile.spring.relyingparty.metadata.ReloadServiceConfigurationTest</pre>.
*/
+ at SuppressWarnings("javadoc")
public class ReloadClientResolverServiceConfigurationTest {
/** The service. */
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderMetadataResolverServiceConfigurationTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderMetadataResolverServiceConfigurationTest.java
index 8a74b9f..447451a 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderMetadataResolverServiceConfigurationTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/profile/spring/relyingparty/metadata/impl/ReloadProviderMetadataResolverServiceConfigurationTest.java
@@ -47,6 +47,7 @@ import net.shibboleth.shared.spring.service.ReloadableSpringService;
/**
* Unit tests for {@link ProviderMetadataResolverServiceStrategy}.
*/
+ at SuppressWarnings("javadoc")
public class ReloadProviderMetadataResolverServiceConfigurationTest {
/** The service. */
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list