[java-shib-shared] branch main updated: IDP-2069 Null Handling Task https://shibboleth.atlassian.net/browse/IDP-2069 Add a missed annotation.

[Rod Widdowson]

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

rdw 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=a9d33d375a81d5011717c0deabf91ec0c1cee7a1

The following commit(s) were added to refs/heads/main by this push:
     new a9d33d37 IDP-2069 Null Handling Task https://shibboleth.atlassian.net/browse/IDP-2069 Add a missed annotation.
a9d33d37 is described below

commit a9d33d375a81d5011717c0deabf91ec0c1cee7a1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Apr 29 11:10:12 2023 +0100

    IDP-2069 Null Handling Task
    https://shibboleth.atlassian.net/browse/IDP-2069
    Add a missed annotation.
---
 .../main/java/net/shibboleth/shared/scripting/EvaluableScript.java  | 2 +-
 .../src/main/java/net/shibboleth/shared/velocity/Template.java      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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 5c0474ab..828c6f01 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
@@ -238,7 +238,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
      * We extract the cause from the Component Initialization and if it is a {@link ScriptException}
      * throw that, otherwise we throw a new one which encapsulates the exception.
      * 
-     * Deprecation note.  In most non-test cases the was to resolve this deprecation is to
+     * Deprecation note.  In most non-test cases the way to resolve this deprecation is to
      * remove the method call (since most use is in bean generation and the initialize will be
      * called).  In every other case the answer is to use {@link #initialize()} and change the callers
      * signature. Or just remove the whole thing.
diff --git a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
index 0c585a72..a9339cbd 100644
--- a/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
+++ b/shib-velocity/src/main/java/net/shibboleth/shared/velocity/Template.java
@@ -217,10 +217,12 @@ public final class Template {
      * 
      * @return the generated output of the template
      */
-    public String merge(final Context templateContext) {
+    @Nonnull public String merge(final Context templateContext) {
         final StringWriter output = new StringWriter();
         merge(templateContext, output);
-        return output.toString();
+        final String result = output.toString();
+        assert result != null;
+        return result;
     }
 
     /**

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