[java-opensaml] branch main updated: Remove inapplicable nullability annotations
Ian Young
ian at iay.org.uk
Thu Nov 10 11:52:22 UTC 2022
This is an automated email from the git hooks/post-receive script.
iay pushed a commit to branch main
in repository java-opensaml.
View the commit online:
http://git.shibboleth.net/view/?p=java-opensaml.git;a=commit;h=1e129502494e1a607f2336c58d914ace93c226f0
The following commit(s) were added to refs/heads/main by this push:
new 1e1295024 Remove inapplicable nullability annotations
1e1295024 is described below
commit 1e129502494e1a607f2336c58d914ace93c226f0
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Thu Nov 10 11:52:19 2022 +0000
Remove inapplicable nullability annotations
---
.../java/org/opensaml/saml/common/binding/SAMLBindingSupport.java | 2 +-
.../common/messaging/context/AttributeConsumingServiceContext.java | 2 +-
.../saml/common/messaging/logic/ProxiedRequesterPredicate.java | 2 +-
.../src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java | 2 +-
.../saml/metadata/resolver/filter/impl/EntityAttributesFilter.java | 4 ++--
.../saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java | 4 ++--
.../saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
index 21f4cf5d6..2f9af89ad 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/binding/SAMLBindingSupport.java
@@ -353,7 +353,7 @@ public final class SAMLBindingSupport {
* @param artifactEndpointIndex the endpoint index byte array, must have length == 2, and big endian byte order.
* @return the convert integer value
*/
- @Nonnull public static int convertSAML2ArtifactEndpointIndex(@Nonnull final byte[] artifactEndpointIndex) {
+ public static int convertSAML2ArtifactEndpointIndex(@Nonnull final byte[] artifactEndpointIndex) {
Constraint.isNotNull(artifactEndpointIndex, "Artifact endpoint index cannot be null");
Constraint.isTrue(artifactEndpointIndex.length == 2, "Artifact endpoint index length was not 2, was: "
+ artifactEndpointIndex.length);
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AttributeConsumingServiceContext.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AttributeConsumingServiceContext.java
index 92803a2e3..b8ed45519 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AttributeConsumingServiceContext.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/context/AttributeConsumingServiceContext.java
@@ -47,7 +47,7 @@ public final class AttributeConsumingServiceContext extends BaseContext {
* @param acs assertion to be validated
*
*/
- @Nonnull public void setAttributeConsumingService(@Nullable final AttributeConsumingService acs) {
+ public void setAttributeConsumingService(@Nullable final AttributeConsumingService acs) {
attributeConsumingService = acs;
}
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
index 5e62046ac..e879bc23b 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/messaging/logic/ProxiedRequesterPredicate.java
@@ -56,7 +56,7 @@ public class ProxiedRequesterPredicate implements Predicate<MessageContext> {
}
/** {@inheritDoc} */
- @Nullable public boolean test(@Nullable final MessageContext input) {
+ public boolean test(@Nullable final MessageContext input) {
final ProxiedRequesterContext ctx = input != null ? input.getSubcontext(ProxiedRequesterContext.class) : null;
if (ctx != null) {
diff --git a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
index 5a1d8e929..9e846115b 100644
--- a/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
+++ b/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
@@ -266,7 +266,7 @@ public class SAMLSchemaBuilder {
/**
* Configure the appropriate {@link SchemaBuilder} with the right set of schemas.
*/
- @Nonnull private void configureBuilder() {
+ private void configureBuilder() {
for (final String source : baseXMLSchemas) {
addSchemaToBuilder(source);
}
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
index 0d38a0d30..12acc520f 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/EntityAttributesFilter.java
@@ -197,7 +197,7 @@ public class EntityAttributesFilter extends AbstractInitializableComponent imple
* @param container extension container
* @param input input object
*/
- @Nonnull private void addEntityAttribute(@Nonnull final EntityDescriptor descriptor,
+ private void addEntityAttribute(@Nonnull final EntityDescriptor descriptor,
@Nonnull final EntityAttributes container, @Nonnull final Attribute input) {
Attribute toMutate = null;
@@ -247,7 +247,7 @@ public class EntityAttributesFilter extends AbstractInitializableComponent imple
*
* @param descriptor input to evaluate
*/
- @Nullable private void applyFilter(@Nonnull final EntityDescriptor descriptor) {
+ private void applyFilter(@Nonnull final EntityDescriptor descriptor) {
final Extensions ext = descriptor.getExtensions();
if (ext != null) {
final Collection<XMLObject> entityAttributesCollection =
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
index 9f2b514bf..661afeca4 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/impl/AbstractDynamicMetadataResolver.java
@@ -1000,7 +1000,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
*
* @throws FilterException if there is a problem filtering the metadata
*/
- @Nonnull protected void processNewMetadata(@Nonnull final XMLObject root, @Nonnull final String expectedEntityID)
+ protected void processNewMetadata(@Nonnull final XMLObject root, @Nonnull final String expectedEntityID)
throws FilterException {
try {
processNewMetadata(root, expectedEntityID, false);
@@ -1028,7 +1028,7 @@ public abstract class AbstractDynamicMetadataResolver extends AbstractMetadataRe
* @throws ResolverException if there is a problem processing the metadata
*/
//CheckStyle: ReturnCount|CyclomaticComplexity OFF
- @Nonnull protected void processNewMetadata(@Nonnull final XMLObject root, @Nonnull final String expectedEntityID,
+ protected void processNewMetadata(@Nonnull final XMLObject root, @Nonnull final String expectedEntityID,
final boolean fromPersistentCache) throws FilterException, ResolverException {
final XMLObject filteredMetadata = filterMetadata(prepareForFiltering(root));
diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
index edc867da8..de1946335 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/saml2/binding/decoding/impl/HTTPArtifactDecoder.java
@@ -341,7 +341,7 @@ public class HTTPArtifactDecoder extends BaseHttpServletRequestXMLMessageDecoder
*
* @param profileId the profile ID, or null
*/
- @Nonnull public void setSOAPClientSecurityConfigurationProfileId(@Nullable final String profileId) {
+ public void setSOAPClientSecurityConfigurationProfileId(@Nullable final String profileId) {
soapClientSecurityConfigurationProfileId = StringSupport.trimOrNull(profileId);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list