[java-support] 04/11: JSPT-96 EvaulableScript.setLanguage(String) becomes setEngineName

[Rod Widdowson]

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

rdw pushed a commit to branch dev/JSPT-95
in repository java-support.

View the commit online:
http://git.shibboleth.net/view/?p=java-support.git;a=commit;h=21d3e6e3d5763ea10d6b0d7916692d35aa408221

commit 21d3e6e3d5763ea10d6b0d7916692d35aa408221
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Mar 29 14:08:29 2020 +0100

    JSPT-96 EvaulableScript.setLanguage(String) becomes setEngineName
    
    https://issues.shibboleth.net/jira/browse/JSPT-96
---
 .../shibboleth/utilities/java/support/logic/ScriptedFunction.java | 4 ++--
 .../utilities/java/support/logic/ScriptedPredicate.java           | 6 +++---
 .../utilities/java/support/scripting/EvaluableScript.java         | 2 +-
 .../utilities/java/support/scripting/EvaluableScriptTest.java     | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
index 763a2d2..498c5bb 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedFunction.java
@@ -146,7 +146,7 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
             @Nonnull final Resource resource) throws ScriptException, IOException {
         try (final InputStream is = resource.getInputStream()) {
             final EvaluableScript script = new EvaluableScript();
-            script.setScriptLanguage(engineName);
+            script.setEngineName(engineName);
             script.setScript(is);
             script.initializeWithScriptException();
             return new ScriptedFunction<>(script, resource.getDescription());
@@ -186,7 +186,7 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
     public static <T,U> ScriptedFunction<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
             @Nonnull @NotEmpty final String scriptSource) throws ScriptException {
         final EvaluableScript script = new EvaluableScript();
-        script.setScriptLanguage(engineName);
+        script.setEngineName(engineName);
         script.setScript(scriptSource);
         script.initializeWithScriptException();
         return new ScriptedFunction<>(script, "Inline");
diff --git a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
index bb0b70f..c32a44b 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/logic/ScriptedPredicate.java
@@ -112,7 +112,7 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
             @Nonnull final Resource resource) throws ScriptException, IOException {
         try (final InputStream is = resource.getInputStream()) {
             final EvaluableScript script = new EvaluableScript();
-            script.setScriptLanguage(engineName);
+            script.setEngineName(engineName);
             script.setScript(is);
             script.initializeWithScriptException();
             return new ScriptedPredicate<>(script, resource.getDescription());
@@ -149,7 +149,7 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
     public static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String engineName,
             @Nonnull @NotEmpty final String scriptSource) throws ScriptException {
         final EvaluableScript script = new EvaluableScript();
-        script.setScriptLanguage(engineName);
+        script.setEngineName(engineName);
         script.setScript(scriptSource);
         script.initializeWithScriptException();
         return new ScriptedPredicate<>(script, "Inline");
@@ -169,7 +169,7 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
     public static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String scriptSource)
             throws ScriptException {
         final EvaluableScript script = new EvaluableScript();
-        script.setScriptLanguage(DEFAULT_ENGINE);
+        script.setEngineName(DEFAULT_ENGINE);
         script.setScript(scriptSource);
         script.initializeWithScriptException();
         return new ScriptedPredicate<>(script, "Inline");
diff --git a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
index d12a433..31511af 100644
--- a/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
+++ b/src/main/java/net/shibboleth/utilities/java/support/scripting/EvaluableScript.java
@@ -337,7 +337,7 @@ public final class EvaluableScript extends AbstractInitializableComponent {
      *
      * @param what the script language
      */
-    @Nonnull @NotEmpty public void setScriptLanguage(@Nonnull @NotEmpty final String what) {
+    @Nonnull @NotEmpty public void setEngineName(@Nonnull @NotEmpty final String what) {
         scriptLanguage = Constraint.isNotNull(StringSupport.trimOrNull(what),
                 "Language must not be null");
     }
diff --git a/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java b/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
index 00223fd..d9aa798 100644
--- a/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
+++ b/src/test/java/net/shibboleth/utilities/java/support/scripting/EvaluableScriptTest.java
@@ -122,7 +122,7 @@ public class EvaluableScriptTest {
 
     private EvaluableScript testEvaluableScript(String language, String script) throws ComponentInitializationException {
         final EvaluableScript ev = new EvaluableScript();
-        ev.setScriptLanguage(language);
+        ev.setEngineName(language);
         ev.setScript(script);
         ev.initialize();
         return ev;
@@ -130,7 +130,7 @@ public class EvaluableScriptTest {
 
     private EvaluableScript testEvaluableScript(String language, File script) throws ComponentInitializationException, IOException {
         final EvaluableScript ev = new EvaluableScript();
-        ev.setScriptLanguage(language);
+        ev.setEngineName(language);
         ev.setScript(script);
         ev.initialize();
         return ev;
@@ -138,7 +138,7 @@ public class EvaluableScriptTest {
 
     private EvaluableScript testEvaluableScript(String language, InputStream script) throws ComponentInitializationException, IOException {
         final EvaluableScript ev = new EvaluableScript();
-        ev.setScriptLanguage(language);
+        ev.setEngineName(language);
         ev.setScript(script);
         ev.initialize();
         return ev;
@@ -146,7 +146,7 @@ public class EvaluableScriptTest {
 
     private EvaluableScript testEvaluableScript(String language, Resource script) throws ComponentInitializationException, IOException {
         final EvaluableScript ev = new EvaluableScript();
-        ev.setScriptLanguage(language);
+        ev.setEngineName(language);
         ev.setScript(script);
         ev.initialize();
         return ev;

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