[spring-extensions] 01/01: JSPT-95 use non deprecated EvaluableScript constructors

[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 spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=8487eb96a57bb875f1d6598df41df4d005e23ac4

commit 8487eb96a57bb875f1d6598df41df4d005e23ac4
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Mar 28 16:30:26 2020 +0000

    JSPT-95 use non deprecated EvaluableScript constructors
    
    https://issues.shibboleth.net/jira/browse/JSPT-95
---
 pom.xml                                                 |  2 +-
 .../ext/spring/factory/EvaluableScriptFactoryBean.java  | 17 +++++++++++------
 .../ext/spring/resource/HTTPResourceTest.java           |  4 ----
 .../ext/spring/resource/RunnableResourceTest.java       |  8 ++++++--
 .../shibboleth/ext/spring/resource/RunnableResource.xml |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9f9daf5..08e3304 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
 
     <properties>
         <automatic.module.name>net.shibboleth.ext.spring</automatic.module.name>
-        <java-support.version>8.0.0</java-support.version>
+        <java-support.version>8.0.1-SNAPSHOT</java-support.version>
     </properties>
 
     <repositories>
diff --git a/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java b/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
index 8251d28..2ed791f 100644
--- a/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
+++ b/src/main/java/net/shibboleth/ext/spring/factory/EvaluableScriptFactoryBean.java
@@ -141,14 +141,19 @@ public class EvaluableScriptFactoryBean extends AbstractComponentAwareFactoryBea
                 script = StringSupport.inputStreamToString(is, null);
             }
         }
-        log.debug("{} Script: {}", sourceId, script);
+        log.debug("{} Language: {} Script: {} ", sourceId, engineName==null ? "<default>" : engineName, script);
 
-        if (null == engineName) {
-            log.debug("{} default language", sourceId);
-            return new EvaluableScript(script);
+        final EvaluableScript evaluableScript = new EvaluableScript();
+        evaluableScript.setScript(script);
+
+        if (engineName != null) {
+            evaluableScript.setEngineName(engineName);
         }
-        log.debug("{} language : {}", sourceId, engineName);
-        return new EvaluableScript(engineName, script);
+        //
+        // Initialize for compatibility reasons
+        //
+        evaluableScript.initialize();
+        return evaluableScript;
     }
 
 }
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
index b0ee904..57e024b 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
@@ -21,11 +21,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
 import java.time.Instant;
 import java.util.Collection;
-import java.util.Set;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.cache.CacheResponseStatus;
@@ -39,7 +36,6 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/RunnableResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/RunnableResourceTest.java
index 77233d4..f8d21cb 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/RunnableResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/RunnableResourceTest.java
@@ -86,7 +86,9 @@ public class RunnableResourceTest {
     
     
     @Test public void testRunnable() throws ScriptException, ComponentInitializationException {
-        final EvaluableScript script = new EvaluableScript("custom.update();");
+        final EvaluableScript script = new EvaluableScript();
+        script.setScript("custom.update();");
+        script.initialize();
         final ScriptedRunnable runnable = new ScriptedRunnable();
         runnable.setCustomObject(object);
         runnable.setScript(script);
@@ -108,7 +110,9 @@ public class RunnableResourceTest {
     @Test public void testResource() throws ScriptException, ComponentInitializationException, IOException, InterruptedException {
         
         final long now = new File(fileName).lastModified();
-        final EvaluableScript script = new EvaluableScript("custom.update();");
+        final EvaluableScript script = new EvaluableScript();
+        script.setScript("custom.update();");
+        script.initialize();
         final ScriptedRunnable runnable = new ScriptedRunnable();
         runnable.setCustomObject(object);
         runnable.setScript(script);
diff --git a/src/test/resources/net/shibboleth/ext/spring/resource/RunnableResource.xml b/src/test/resources/net/shibboleth/ext/spring/resource/RunnableResource.xml
index 8b9f064..aa060c6 100644
--- a/src/test/resources/net/shibboleth/ext/spring/resource/RunnableResource.xml
+++ b/src/test/resources/net/shibboleth/ext/spring/resource/RunnableResource.xml
@@ -6,7 +6,7 @@
     
     <bean id="shibboleth.IdentifiableBeanPostProcessor" class="net.shibboleth.ext.spring.config.IdentifiableBeanPostProcessor" />
     
-    <bean id="Script" class="net.shibboleth.utilities.java.support.scripting.EvaluableScript" c:_0="
+    <bean id="Script" class="net.shibboleth.utilities.java.support.scripting.EvaluableScript" init-method="initialize" p:script="
     var i = 22;
     var j = 7;
     var pi = i/j;

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