[java-oidc-common] branch main updated: Suppress null warnings in tests
Phil Smart
philip.smart at jisc.ac.uk
Fri Apr 5 13:30:52 UTC 2024
This is an automated email from the git hooks/post-receive script.
philsmart 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=ca42bf3d1dd34950c6139d7ae1b194f682735140
The following commit(s) were added to refs/heads/main by this push:
new ca42bf3 Suppress null warnings in tests
ca42bf3 is described below
commit ca42bf3d1dd34950c6139d7ae1b194f682735140
Author: Phil Smart <philip.smart at jisc.ac.uk>
AuthorDate: Fri Apr 5 14:30:49 2024 +0100
Suppress null warnings in tests
---
.../oidc/metadata/cache/impl/BatchMetadataCacheTest.java | 2 +-
.../oidc/metadata/cache/impl/DynamicMetadataCacheTest.java | 2 +-
.../oidc/metadata/cache/impl/FetchThroughMetadataCacheTest.java | 2 +-
.../oidc/metadata/cache/impl/MetadataCacheBuilderTest.java | 2 +-
.../cache/impl/MetadataPolicyLookupStrategyFactoryTest.java | 2 +-
.../oidc/metadata/impl/ClientInformationNodeProcessorTest.java | 2 +-
.../metadata/impl/FilesystemClientInformationResolverTest.java | 3 ++-
.../impl/HTTPProviderConfigurationFetchingStrategyTest.java | 1 +
.../oidc/metadata/impl/OIDCMapMetadataResolverTest.java | 1 +
.../oidc/metadata/impl/OIDCProviderMetadataResolverTest.java | 3 ++-
.../metadata/impl/PropertiesClientSecretValueResolverTest.java | 5 +++--
.../impl/ResolverServiceClientSecretValueResolverTest.java | 8 ++++----
.../metadata/impl/StorageServiceClientInformationManagerTest.java | 2 +-
.../metadata/policy/impl/DefaultMetadataPolicyEnforcerTest.java | 8 ++++----
.../metadata/policy/impl/DefaultMetadataPolicyValidatorTest.java | 2 +-
15 files changed, 25 insertions(+), 20 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 30c4401..4e1ca56 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
@@ -53,7 +53,7 @@ import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
/** Tests for the {@link BatchMetadataCache}.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class BatchMetadataCacheTest {
private BatchMetadataCache<Issuer, OIDCProviderMetadata> cache;
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 03a53a6..9853a62 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
@@ -52,7 +52,7 @@ import net.shibboleth.shared.primitive.LoggerFactory;
import net.shibboleth.shared.resolver.CriteriaSet;
/** Test for the MetadataCache. */
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class DynamicMetadataCacheTest {
/** Class logger. */
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 8eb2505..a50d068 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
@@ -21,7 +21,7 @@ import net.shibboleth.oidc.metadata.criterion.IssuerIDCriterion;
import net.shibboleth.shared.logic.PredicateSupport;
import net.shibboleth.shared.resolver.CriteriaSet;
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class FetchThroughMetadataCacheTest {
/** The cache.*/
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 079c914..8b8d366 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
@@ -38,7 +38,7 @@ import net.shibboleth.shared.collection.CollectionSupport;
import net.shibboleth.shared.component.ComponentInitializationException;
/** Tests for the {@link MetadataCacheBuilder}.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class MetadataCacheBuilderTest {
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 67af301..8389a26 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
@@ -35,7 +35,7 @@ import net.shibboleth.shared.component.ComponentInitializationException;
import net.shibboleth.shared.spring.util.AnnotationParameterNameDiscoverer;
/** Test for MetadataPolicyLookupStrategyFactory.*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class MetadataPolicyLookupStrategyFactoryTest {
/** Factory to test.*/
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 0affde6..f7c75fd 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,7 +72,7 @@ import net.shibboleth.shared.xml.SchemaBuilder;
/**
* Unit tests for {@link ClientInformationNodeProcessor}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
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/FilesystemClientInformationResolverTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/impl/FilesystemClientInformationResolverTest.java
index c890d05..0f95561 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
@@ -51,7 +51,8 @@ public class FilesystemClientInformationResolverTest {
initTest(filename, true);
}
- public void initTest(final String filename, boolean failFastInitialization) throws Exception {
+ @SuppressWarnings("null")
+ public void initTest(final String filename, final boolean failFastInitialization) throws Exception {
clientId = "demo_rp";
clientId2 = "demo_rp2";
final Resource file = new ClassPathResource(filename);
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 bf95a4a..8296ab7 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
@@ -48,6 +48,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
public class HTTPProviderConfigurationFetchingStrategyTest {
+ @SuppressWarnings("unchecked")
@Test
public void testProviderConfigurationLoads_Success() throws Exception {
//TODO look closer
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 51ab34e..f9592be 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
@@ -121,6 +121,7 @@ public class OIDCMapMetadataResolverTest {
private OIDCMapBasedMetadataResolver batchResolver;
+ @SuppressWarnings("null")
@BeforeMethod
public void setup() throws Exception {
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 0c25d21..40fa22e 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
@@ -71,7 +71,7 @@ import net.shibboleth.shared.resolver.Criterion;
import net.shibboleth.shared.resolver.ResolverException;
/** Tests for the {@link OIDCProviderMetadataResolver} .*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class OIDCProviderMetadataResolverTest {
private final static String GOOD_PROVIDER_CONFIGURATION_INFO = "{\n"
@@ -521,6 +521,7 @@ public class OIDCProviderMetadataResolverTest {
assertTrue(foundFromCache.iterator().hasNext());
}
+ @SuppressWarnings("unchecked")
@Test
void testResolve_NullResponse() throws ResolverException, IOException, ComponentInitializationException {
dynCache.initialize();
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 7628d6e..eb787c5 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
@@ -29,7 +29,7 @@ import net.shibboleth.shared.resolver.ResolverException;
/**
* Unit tests for {@link PropertiesClientSecretValueResolver}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class PropertiesClientSecretValueResolverTest
extends BaseClientSecretValueResolverTest<PropertiesClientSecretValueResolver> {
@@ -91,7 +91,8 @@ public class PropertiesClientSecretValueResolverTest
Assert.assertFalse(iterator.hasNext());
}
- protected PropertiesClientSecretValueResolver buildResolver(boolean init) throws ComponentInitializationException {
+ @Override
+ protected PropertiesClientSecretValueResolver buildResolver(final boolean init) throws ComponentInitializationException {
resolver = new PropertiesClientSecretValueResolver();
resolver.setId("mockId");
resolver.setResource(resource);
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 7363b59..2c52681 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
@@ -54,7 +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")
+ at SuppressWarnings(value={"javadoc","null"})
public class ResolverServiceClientSecretValueResolverTest
extends BaseClientSecretValueResolverTest<ResolverServiceClientSecretValueResolver> {
@@ -244,14 +244,14 @@ public class ResolverServiceClientSecretValueResolverTest
}
@Override
- protected ResolverServiceClientSecretValueResolver buildResolver(boolean init)
+ protected ResolverServiceClientSecretValueResolver buildResolver(final boolean init)
throws ComponentInitializationException {
return buildResolver(init, CollectionSupport.listOf("myDBClientSecret", "myLDAPClientSecret"));
}
- protected ResolverServiceClientSecretValueResolver buildResolver(boolean init, List<String> attributeIds)
+ protected ResolverServiceClientSecretValueResolver buildResolver(final boolean init, final List<String> attributeIds)
throws ComponentInitializationException {
- ResolverServiceClientSecretValueResolver resolver = new ResolverServiceClientSecretValueResolver();
+ final ResolverServiceClientSecretValueResolver resolver = new ResolverServiceClientSecretValueResolver();
resolver.setAttributeResolver(getResolver());
resolver.setAttributeIds(attributeIds);
resolver.setId("resolver");
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 bc1fc85..d083c62 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,7 +33,7 @@ import net.shibboleth.shared.resolver.CriteriaSet;
/**
* Unit tests for {@link StorageServiceClientInformationManager}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class StorageServiceClientInformationManagerTest {
StorageServiceClientInformationManager manager;
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 86ec593..dc2cb24 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
@@ -29,7 +29,7 @@ import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Unit tests for {@link DefaultMetadataPolicyEnforcer}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class DefaultMetadataPolicyEnforcerTest {
DefaultMetadataPolicyEnforcer applier;
@@ -506,7 +506,7 @@ public class DefaultMetadataPolicyEnforcerTest {
@Test
public void apply_whenCustomOperatorAcceptsValue_resultIsCandidateWithTrue() {
final String candidate = "expectdValue";
- CustomMetadataPolicyOperator customOperator = Mockito.mock(CustomMetadataPolicyOperator.class);
+ final CustomMetadataPolicyOperator customOperator = Mockito.mock(CustomMetadataPolicyOperator.class);
Mockito.when(customOperator.apply(Mockito.any(), Mockito.any())).thenReturn(candidate);
applier.setCustomMetadataPolicyOperators(CollectionSupport.singletonMap("customOperator", customOperator));
assertResultEquals(applier.apply(candidate,
@@ -516,7 +516,7 @@ public class DefaultMetadataPolicyEnforcerTest {
@Test
public void apply_whenCustomOperatorDoesNotAcceptValue_resultIsFalse() {
final String candidate = "expectdValue";
- CustomMetadataPolicyOperator customOperator = Mockito.mock(CustomMetadataPolicyOperator.class);
+ final CustomMetadataPolicyOperator customOperator = Mockito.mock(CustomMetadataPolicyOperator.class);
Mockito.doThrow(ConstraintViolationException.class).when(customOperator).apply(Mockito.any(), Mockito.any());
applier.setCustomMetadataPolicyOperators(CollectionSupport.singletonMap("customOperator", customOperator));
assertResultFalse(applier.apply(candidate,
@@ -526,7 +526,7 @@ public class DefaultMetadataPolicyEnforcerTest {
@Test
public void apply_whenCustomOperatorNotFound_resultIsFalse() {
final String candidate = "expectdValue";
- CustomMetadataPolicyOperator customOperator = Mockito.mock(CustomMetadataPolicyOperator.class);
+ final CustomMetadataPolicyOperator customOperator = Mockito.mock(CustomMetadataPolicyOperator.class);
Mockito.doThrow(ConstraintViolationException.class).when(customOperator).apply(Mockito.any(), Mockito.any());
applier.setCustomMetadataPolicyOperators(CollectionSupport.singletonMap("customOperator", customOperator));
assertResultFalse(applier.apply(candidate,
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 cd2c264..1abf00a 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
@@ -28,7 +28,7 @@ import net.shibboleth.shared.collection.CollectionSupport;
/**
* Unit tests for {@link DefaultMetadataPolicyValidator}.
*/
- at SuppressWarnings("javadoc")
+ at SuppressWarnings(value={"javadoc","null"})
public class DefaultMetadataPolicyValidatorTest {
DefaultMetadataPolicyValidator validator;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list