[java-opensaml] branch main updated: Add ParameterName annotations to factory methods.

Scott Cantor cantor.2 at osu.edu
Wed Aug 2 19:59:30 UTC 2023


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

scantor 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=35e3da5d179791084de95c7db78e21db57c2ac11

The following commit(s) were added to refs/heads/main by this push:
     new 35e3da5d1 Add ParameterName annotations to factory methods.
35e3da5d1 is described below

commit 35e3da5d179791084de95c7db78e21db57c2ac11
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 2 15:59:26 2023 -0400

    Add ParameterName annotations to factory methods.
---
 .../filter/impl/ScriptedTrustedNamesFunction.java  | 23 ++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java
index 60c14414d..485c98d78 100644
--- a/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java
+++ b/opensaml-saml-impl/src/main/java/org/opensaml/saml/metadata/resolver/filter/impl/ScriptedTrustedNamesFunction.java
@@ -24,6 +24,7 @@ import javax.annotation.Nullable;
 import javax.script.ScriptContext;
 import javax.script.ScriptException;
 
+import net.shibboleth.shared.annotation.ParameterName;
 import net.shibboleth.shared.annotation.constraint.NotEmpty;
 import net.shibboleth.shared.component.ComponentInitializationException;
 import net.shibboleth.shared.resource.Resource;
@@ -91,8 +92,10 @@ public class ScriptedTrustedNamesFunction extends AbstractScriptEvaluator implem
      * @throws IOException if the file doesn't exist.
      * @throws ComponentInitializationException if the scripting initialization fails
      */
-    @Nonnull static ScriptedTrustedNamesFunction resourceScript(@Nonnull @NotEmpty final String engineName,
-            @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+    @Nonnull static ScriptedTrustedNamesFunction resourceScript(
+            @Nonnull @NotEmpty @ParameterName(name="engineName") final String engineName,
+            @Nonnull @ParameterName(name="resource") final Resource resource)
+                    throws ScriptException, IOException, ComponentInitializationException {
         try (final InputStream is = resource.getInputStream()) {
             final EvaluableScript script = new EvaluableScript();
             script.setEngineName(engineName);
@@ -111,8 +114,9 @@ public class ScriptedTrustedNamesFunction extends AbstractScriptEvaluator implem
      * @throws IOException if the file doesn't exist.
      * @throws ComponentInitializationException if the scripting initialization fails
      */
-    @Nonnull static ScriptedTrustedNamesFunction resourceScript(@Nonnull final Resource resource)
-            throws ScriptException, IOException, ComponentInitializationException {
+    @Nonnull static ScriptedTrustedNamesFunction resourceScript(
+            @Nonnull @ParameterName(name="resource") final Resource resource)
+                    throws ScriptException, IOException, ComponentInitializationException {
         return resourceScript(DEFAULT_ENGINE, resource);
     }
 
@@ -125,8 +129,10 @@ public class ScriptedTrustedNamesFunction extends AbstractScriptEvaluator implem
      * @throws ScriptException if the compile fails
      * @throws ComponentInitializationException if the scripting initialization fails
      */
-    @Nonnull static ScriptedTrustedNamesFunction inlineScript(@Nonnull @NotEmpty final String engineName,
-            @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+    @Nonnull static ScriptedTrustedNamesFunction inlineScript(
+            @Nonnull @NotEmpty @ParameterName(name="engineName") final String engineName,
+            @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+                    throws ScriptException, ComponentInitializationException {
         final EvaluableScript script = new EvaluableScript();
         script.setEngineName(engineName);
         script.setScript(scriptSource);
@@ -142,8 +148,9 @@ public class ScriptedTrustedNamesFunction extends AbstractScriptEvaluator implem
      * @throws ScriptException if the compile fails
      * @throws ComponentInitializationException if the scripting initialization fails
      */
-    @Nonnull static ScriptedTrustedNamesFunction inlineScript(@Nonnull @NotEmpty final String scriptSource)
-            throws ScriptException, ComponentInitializationException {
+    @Nonnull static ScriptedTrustedNamesFunction inlineScript(
+            @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+                    throws ScriptException, ComponentInitializationException {
         return inlineScript(DEFAULT_ENGINE, scriptSource);
     }
 

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


More information about the commits mailing list