[java-identity-provider] 01/06: Stop using deprecated method on ScriptedResponseMappingStrategy

[Rod Widdowson]

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

rdw pushed a commit to branch main
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=daf139fe30f5fe3b315337193c6f7eb2dac8fd41

commit daf139fe30f5fe3b315337193c6f7eb2dac8fd41
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 1 14:01:32 2022 +0100

    Stop using deprecated method on ScriptedResponseMappingStrategy
---
 .../http/impl/ScriptedResponseMappingStrategy.java | 28 ++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
index dbf3a9dda..98cc269fb 100644
--- a/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
+++ b/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/dc/http/impl/ScriptedResponseMappingStrategy.java
@@ -46,6 +46,7 @@ import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.dc.http.HTTPResponseMappingStrategy;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
+import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import net.shibboleth.utilities.java.support.primitive.StringSupport;
 import net.shibboleth.utilities.java.support.resource.Resource;
@@ -297,7 +298,21 @@ public final class ScriptedResponseMappingStrategy extends AbstractScriptEvaluat
             final EvaluableScript script = new EvaluableScript();
             script.setEngineName(engineName);
             script.setScript(is);
-            script.initializeWithScriptException();
+            try {
+                script.initialize();
+            } catch (final ComponentInitializationException e) {
+                final Throwable cause = e.getCause();
+
+                if (cause != null) {
+                    if (cause instanceof ScriptException) {
+                        throw (ScriptException) cause;
+                    }
+                    else if (cause instanceof IOException) {
+                        throw (IOException) cause;
+                    }
+                }
+                throw new ScriptException(e);
+            }
             return new ScriptedResponseMappingStrategy(script);
         }
     }
@@ -328,7 +343,16 @@ public final class ScriptedResponseMappingStrategy extends AbstractScriptEvaluat
         final EvaluableScript script = new EvaluableScript();
         script.setEngineName(engineName);
         script.setScript(scriptSource);
-        script.initializeWithScriptException();
+        try {
+            script.initialize();
+        } catch (final ComponentInitializationException e) {
+            final Throwable cause = e.getCause();
+
+            if (cause != null && cause instanceof ScriptException) {
+                throw (ScriptException) cause;
+            }
+            throw new ScriptException(e);
+        }
         return new ScriptedResponseMappingStrategy(script);
     }
 

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