[java-shib-shared] branch main updated: Remove some misplaced nullability annotations

[Ian Young]

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

iay 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=d91bc58d02c5f6a7c1dc9a6a133cd594cb8bb482

The following commit(s) were added to refs/heads/main by this push:
     new d91bc58d Remove some misplaced nullability annotations
d91bc58d is described below

commit d91bc58d02c5f6a7c1dc9a6a133cd594cb8bb482
Author: Ian Young <ian at iay.org.uk>
AuthorDate: Tue Oct 25 16:08:58 2022 +0100

    Remove some misplaced nullability annotations
    
    Primitives, particularly void, can't be null by definition.
---
 .../shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java |  2 +-
 .../java/net/shibboleth/shared/spring/util/SpringSupport.java  |  6 +++---
 .../java/net/shibboleth/shared/scripting/EvaluableScript.java  | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java
index bfa39fb0..1602688d 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/servlet/impl/SameSiteCookieHeaderFilter.java
@@ -321,7 +321,7 @@ public class SameSiteCookieHeaderFilter extends AbstractConditionalFilter implem
          */
         private void appendSameSiteAttribute(@Nonnull @NotEmpty final String cookieHeader,
                 @Nonnull @NotEmpty final String sameSiteValue,
-                @Nonnull final boolean first) {
+                final boolean first) {
             
             String sameSiteSetCookieValue =  cookieHeader;
             
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
index 3e2a2234..6ff3e385 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
@@ -83,7 +83,7 @@ public final class SpringSupport {
      * @param parserContext current parsing context
      *
      */
-    @Nullable public static void parseCustomElements(
+    public static void parseCustomElements(
             @Nullable @NonnullElements final Collection<Element> elements, @Nonnull final ParserContext parserContext) {
         if (elements == null) {
             return;
@@ -134,7 +134,7 @@ public final class SpringSupport {
      * 
      * @since 6.0.0
      */
-    @Nullable public static void parseLazyInitCustomElements(
+    public static void parseLazyInitCustomElements(
             @Nullable @NonnullElements final Collection<Element> elements, @Nonnull final ParserContext parserContext) {
         if (elements == null) {
             return;
@@ -191,7 +191,7 @@ public final class SpringSupport {
      * 
      * @since 6.0.0
      */
-    @Nullable public static void parseLazyInitCustomElement(@Nullable final Element element, 
+    public static void parseLazyInitCustomElement(@Nullable final Element element, 
             @Nonnull final ParserContext parserContext) {
         if (element == null) {
             return;
diff --git a/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
index 4a9490fa..a31feb9e 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/scripting/EvaluableScript.java
@@ -84,7 +84,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
      *
      * @param what the script source
      */
-    @Nonnull @NotEmpty public void setScript(@Nonnull @NotEmpty final String what) {
+    public void setScript(@Nonnull @NotEmpty final String what) {
         script = Constraint.isNotNull(StringSupport.trimOrNull(what), "Script must not be null");
         if ("".equals(script)) {
             throw new ConstraintViolationException("Script must be non-empty");
@@ -97,7 +97,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
      * @param scriptSource how to get the script source
      * @throws IOException if there were issues reading the script
      */
-    @Nonnull @NotEmpty public void setScript(@Nonnull final InputStream scriptSource) throws IOException {
+    public void setScript(@Nonnull final InputStream scriptSource) throws IOException {
 
         Constraint.isNotNull(scriptSource, "Script source should not be null");
 
@@ -111,7 +111,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
      * @param scriptSource how to get the script source
      * @throws IOException if there were issues reading the script
      */
-    @Nonnull @NotEmpty public void setScript(@Nonnull final File scriptSource) throws IOException {
+    public void setScript(@Nonnull final File scriptSource) throws IOException {
 
         Constraint.isNotNull(scriptSource, "Script source should not be null");
 
@@ -135,7 +135,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
      * @param scriptSource how to get the script source
      * @throws IOException if there were issues reading the script
      */
-    @Nonnull @NotEmpty public void setScript(@Nonnull final Resource scriptSource) throws IOException {
+    public void setScript(@Nonnull final Resource scriptSource) throws IOException {
 
         Constraint.isNotNull(scriptSource, "Script source should not be null");
 
@@ -156,7 +156,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
      *
      * @param what the script language
      */
-    @Nonnull @NotEmpty public void setEngineName(@Nonnull @NotEmpty final String what) {
+    public void setEngineName(@Nonnull @NotEmpty final String what) {
         scriptLanguage = Constraint.isNotNull(StringSupport.trimOrNull(what),
                 "Language must not be null");
     }

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