[java-oidc-common] branch main updated: Fix some null errors.
Scott Cantor
cantor.2 at osu.edu
Tue May 21 20:22:20 UTC 2024
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=7d2a63b99270f73aa7f8a66c5683216b767aea3f
The following commit(s) were added to refs/heads/main by this push:
new 7d2a63b Fix some null errors.
7d2a63b is described below
commit 7d2a63b99270f73aa7f8a66c5683216b767aea3f
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue May 21 16:22:18 2024 -0400
Fix some null errors.
---
.../impl/AbstractFileOIDCEntityResolver.java | 2 +-
.../provider/ClientSecretReferenceProvider.java | 1 +
.../impl/BeanMetadataPolicyOperatorTest.java | 23 +++++++++++++---------
.../impl/OIDCMetadataPolicyResolverTest.java | 9 +++++----
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/AbstractFileOIDCEntityResolver.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/AbstractFileOIDCEntityResolver.java
index b3ee9aa..1b62bad 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/AbstractFileOIDCEntityResolver.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/impl/AbstractFileOIDCEntityResolver.java
@@ -87,7 +87,7 @@ public abstract class AbstractFileOIDCEntityResolver<Key extends Identifier, Val
/** {@inheritDoc} */
@Override
- protected String getMetadataIdentifier() {
+ @Nonnull protected String getMetadataIdentifier() {
final String path = metadataFile.getAbsolutePath();
if (path == null) {
return "unknown";
diff --git a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
index 7fa3193..e6bffc4 100644
--- a/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
+++ b/oidc-common-metadata-impl/src/main/java/net/shibboleth/oidc/metadata/keyinfo/ext/impl/provider/ClientSecretReferenceProvider.java
@@ -79,6 +79,7 @@ public class ClientSecretReferenceProvider extends AbstractKeyInfoProvider {
return null;
}
final String secretReference = clientSecretReference.getValue();
+ assert secretReference != null;
for (final ClientSecretValueResolver valueResolver : clientSecretValueResolvers) {
log.trace("Attempting to resolve value for {} with {}", secretReference, valueResolver.getId());
final CriteriaSet criteria = new CriteriaSet(new ClientSecretReferenceCriterion(secretReference));
diff --git a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/BeanMetadataPolicyOperatorTest.java b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/BeanMetadataPolicyOperatorTest.java
index e3a0ffc..68844ed 100644
--- a/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/BeanMetadataPolicyOperatorTest.java
+++ b/oidc-common-metadata-impl/src/test/java/net/shibboleth/oidc/metadata/policy/impl/BeanMetadataPolicyOperatorTest.java
@@ -15,6 +15,7 @@
package net.shibboleth.oidc.metadata.policy.impl;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.mockito.Mockito;
import org.springframework.beans.BeansException;
@@ -29,7 +30,7 @@ import net.shibboleth.shared.logic.ConstraintViolationException;
/**
* Unit tests for {@link BeanMetadataPolicyOperator}.
*/
- at SuppressWarnings("null")
+ at SuppressWarnings("javadoc")
public class BeanMetadataPolicyOperatorTest {
BeanMetadataPolicyOperator operator;
@@ -141,12 +142,13 @@ public class BeanMetadataPolicyOperatorTest {
return new CustomMetadataPolicyOperator() {
@Override
- public Object apply(Object inputValue, MetadataPolicy policy) throws ConstraintViolationException {
+ @Nullable public Object apply(@Nullable final Object inputValue, @Nonnull final MetadataPolicy policy)
+ throws ConstraintViolationException {
return inputValue;
}
@Override
- public boolean validate(MetadataPolicy policy) {
+ public boolean validate(@Nonnull final MetadataPolicy policy) {
return true;
}
};
@@ -156,12 +158,13 @@ public class BeanMetadataPolicyOperatorTest {
return new CustomMetadataPolicyOperator() {
@Override
- public Object apply(Object inputValue, MetadataPolicy policy) throws ConstraintViolationException {
+ @Nullable public Object apply(@Nullable final Object inputValue, @Nonnull final MetadataPolicy policy)
+ throws ConstraintViolationException {
return "changedValue";
}
@Override
- public boolean validate(MetadataPolicy policy) {
+ public boolean validate(@Nonnull final MetadataPolicy policy) {
return false;
}
};
@@ -171,12 +174,13 @@ public class BeanMetadataPolicyOperatorTest {
return new CustomMetadataPolicyOperator() {
@Override
- public Object apply(Object inputValue, MetadataPolicy policy) throws ConstraintViolationException {
+ @Nullable public Object apply(@Nullable final Object inputValue, @Nonnull final MetadataPolicy policy)
+ throws ConstraintViolationException {
return "changedValue";
}
@Override
- public boolean validate(MetadataPolicy policy) {
+ public boolean validate(@Nonnull final MetadataPolicy policy) {
return true;
}
};
@@ -186,12 +190,13 @@ public class BeanMetadataPolicyOperatorTest {
return new CustomMetadataPolicyOperator() {
@Override
- public Object apply(Object inputValue, MetadataPolicy policy) throws ConstraintViolationException {
+ @Nullable public Object apply(@Nullable final Object inputValue, @Nonnull final MetadataPolicy policy)
+ throws ConstraintViolationException {
throw new ConstraintViolationException("mock");
}
@Override
- public boolean validate(MetadataPolicy policy) {
+ public boolean validate(@Nonnull final MetadataPolicy policy) {
return true;
}
};
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 c79faba..9f751d4 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
@@ -21,6 +21,7 @@ import java.util.List;
import java.util.Map;
import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
import org.springframework.core.io.ClassPathResource;
import org.springframework.core.io.Resource;
@@ -120,12 +121,12 @@ public class OIDCMetadataPolicyResolverTest {
final CustomMetadataPolicyOperator customOperator = new CustomMetadataPolicyOperator() {
@Override
- public boolean validate(final MetadataPolicy policy) {
+ public boolean validate(@Nonnull final MetadataPolicy policy) {
return true;
}
@Override
- public Object apply(final Object inputValue, final MetadataPolicy policy)
+ public Object apply(@Nullable final Object inputValue, @Nonnull final MetadataPolicy policy)
throws ConstraintViolationException {
return null;
}
@@ -149,12 +150,12 @@ public class OIDCMetadataPolicyResolverTest {
final CustomMetadataPolicyOperator customOperator = new CustomMetadataPolicyOperator() {
@Override
- public boolean validate(final MetadataPolicy policy) {
+ public boolean validate(@Nonnull final MetadataPolicy policy) {
return false;
}
@Override
- public Object apply(final Object inputValue, final MetadataPolicy policy)
+ public Object apply(@Nullable final Object inputValue, @Nonnull final MetadataPolicy policy)
throws ConstraintViolationException {
return null;
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list