[java-shib-shared] branch main updated: Clean up some annotations.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-shared.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=6a92c3c1df790a29bfa6cb1d0a8cd297188e4056

The following commit(s) were added to refs/heads/main by this push:
     new 6a92c3c1 Clean up some annotations.
6a92c3c1 is described below

commit 6a92c3c1df790a29bfa6cb1d0a8cd297188e4056
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Jun 13 17:05:24 2023 -0400

    Clean up some annotations.
---
 .../shibboleth/shared/spring/config/BooleanToPredicateConverter.java   | 3 +--
 .../net/shibboleth/shared/spring/config/StringToDurationConverter.java | 3 +--
 .../net/shibboleth/shared/spring/config/StringToPeriodConverter.java   | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
index 3b95d279..385322d1 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/BooleanToPredicateConverter.java
@@ -20,7 +20,6 @@ package net.shibboleth.shared.spring.config;
 import java.util.function.Predicate;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 import org.springframework.core.convert.converter.Converter;
 
@@ -32,7 +31,7 @@ import net.shibboleth.shared.logic.PredicateSupport;
 public class BooleanToPredicateConverter implements Converter<Boolean,Predicate<?>> {
 
     /** {@inheritDoc} */
-    @Nullable public Predicate<?> convert(@Nonnull final Boolean source) {
+    public Predicate<?> convert(@Nonnull final Boolean source) {
         return source ? PredicateSupport.alwaysTrue() : PredicateSupport.alwaysFalse();
     }
     
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java
index d93cd851..9f77dc2b 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToDurationConverter.java
@@ -20,7 +20,6 @@ package net.shibboleth.shared.spring.config;
 import java.time.Duration;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 import org.springframework.core.convert.converter.Converter;
 
@@ -33,7 +32,7 @@ public class StringToDurationConverter implements Converter<String,Duration> {
 
     /** {@inheritDoc} */
     @SuppressWarnings("null")
-    @Nullable public Duration convert(@Nonnull final String source) {
+    public Duration convert(@Nonnull final String source) {
         if (source.startsWith("P") || source.startsWith("-P")) {
             return DOMTypeSupport.stringToDuration(source.trim());
         }
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java
index c79499aa..e6be37f9 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToPeriodConverter.java
@@ -20,7 +20,6 @@ package net.shibboleth.shared.spring.config;
 import java.time.Period;
 
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 
 import org.springframework.core.convert.converter.Converter;
 
@@ -30,7 +29,7 @@ import org.springframework.core.convert.converter.Converter;
 public class StringToPeriodConverter implements Converter<String,Period> {
 
     /** {@inheritDoc} */
-    @Nullable public Period convert(@Nonnull final String source) {
+    public Period convert(@Nonnull final String source) {
         if (source.startsWith("P") || source.startsWith("-P")) {
             return Period.parse(source);
         }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.