[java-idp-plugin-scripting] branch main updated: JSCRIPTING-14 Move Scripting Plugins to Java 17.
Rod Widdowson
rdw at steadingsoftware.com
Sun Jun 11 13:19:24 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch main
in repository java-idp-plugin-scripting.
View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-scripting.git;a=commit;h=a6d9357bfa996915552f68b3c0833f123ff4e3ab
The following commit(s) were added to refs/heads/main by this push:
new a6d9357 JSCRIPTING-14 Move Scripting Plugins to Java 17.
a6d9357 is described below
commit a6d9357bfa996915552f68b3c0833f123ff4e3ab
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sun Jun 11 14:16:36 2023 +0100
JSCRIPTING-14 Move Scripting Plugins to Java 17.
https://shibboleth.atlassian.net/browse/JSCRIPTING-14
---
.../idp/plugin/scripting/nashorn/graalvm/GraalEngine.java | 1 -
.../idp/plugin/scripting/nashorn/graalvm/NashornPlugin.java | 8 ++++----
.../idp/plugin/scripting/nashorn/jdk/NashornPlugin.java | 10 +++++-----
pom.xml | 4 ++--
rhino-impl/pom.xml | 5 -----
.../net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java | 8 ++++----
.../idp/plugin/scripting/AbstractScriptEngineFactory.java | 5 +++--
7 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/GraalEngine.java b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/GraalEngine.java
index 446285d..306ef4e 100644
--- a/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/GraalEngine.java
+++ b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/GraalEngine.java
@@ -31,7 +31,6 @@ import org.graalvm.polyglot.Source;
import org.graalvm.polyglot.Value;
import net.shibboleth.idp.plugin.scripting.AbstractScriptEngine;
-import net.shibboleth.utilities.java.support.scripting.EvaluableScript;
/**
* A subset of {@link ScriptEngine} implemented with GraaVm with enough function that
diff --git a/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/NashornPlugin.java b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/NashornPlugin.java
index 9376cdf..6714073 100644
--- a/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/NashornPlugin.java
+++ b/nashorn-graalvm-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/graalvm/NashornPlugin.java
@@ -19,15 +19,15 @@ package net.shibboleth.idp.plugin.scripting.nashorn.graalvm;
import java.io.IOException;
-import net.shibboleth.idp.plugin.PluginException;
-import net.shibboleth.idp.plugin.PropertyDrivenIdPPlugin;
import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
+import net.shibboleth.profile.plugin.PluginException;
/**Details about the Nashorn scripting plugin. */
public class NashornPlugin extends FirstPartyIdPPlugin {
/** Constructor.
- * @throws PluginException from {@link PropertyDrivenIdPPlugin}
- * @throws IOException {@link PropertyDrivenIdPPlugin} */
+ * @throws PluginException from {@link FirstPartyIdPPlugin}
+ * @throws IOException from {@link FirstPartyIdPPlugin}
+ */
public NashornPlugin() throws IOException, PluginException {
super(NashornPlugin.class);
}
diff --git a/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.java b/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.java
index 8446e67..a4b1c05 100644
--- a/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.java
+++ b/nashorn-jdk-impl/src/main/java/net/shibboleth/idp/plugin/scripting/nashorn/jdk/NashornPlugin.java
@@ -19,16 +19,16 @@ package net.shibboleth.idp.plugin.scripting.nashorn.jdk;
import java.io.IOException;
-import net.shibboleth.idp.plugin.PluginException;
-import net.shibboleth.idp.plugin.PropertyDrivenIdPPlugin;
import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
+import net.shibboleth.profile.plugin.PluginException;
/**Details about the Nashorn scripting plugin. */
public class NashornPlugin extends FirstPartyIdPPlugin {
/** Constructor.
- * @throws PluginException from {@link PropertyDrivenIdPPlugin}
- * @throws IOException {@link PropertyDrivenIdPPlugin} */
- public NashornPlugin() throws IOException, PluginException {
+ * @throws PluginException from {@link FirstPartyIdPPlugin}
+ * @throws IOException from {@link FirstPartyIdPPlugin}
+ */
+ public NashornPlugin() throws PluginException, IOException {
super(NashornPlugin.class);
}
}
diff --git a/pom.xml b/pom.xml
index d65d32f..82318c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>net.shibboleth</groupId>
<artifactId>parent</artifactId>
- <version>11.3.4</version>
+ <version>17.0.0-SNAPSHOT</version>
</parent>
<groupId>net.shibboleth.idp.plugin.scripting</groupId>
@@ -22,7 +22,7 @@
<properties>
<idp.groupId>net.shibboleth.idp</idp.groupId>
- <idp.version>4.1.0</idp.version>
+ <idp.version>5.0.0-SNAPSHOT</idp.version>
<checkstyle.configLocation>${project.basedir}/checkstyle.xml</checkstyle.configLocation>
</properties>
diff --git a/rhino-impl/pom.xml b/rhino-impl/pom.xml
index 31634e3..56383f6 100644
--- a/rhino-impl/pom.xml
+++ b/rhino-impl/pom.xml
@@ -46,11 +46,6 @@
<artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>net.shibboleth.utilities</groupId>
- <artifactId>java-support</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-admin-api</artifactId>
diff --git a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
index 1a282ef..c8a725b 100644
--- a/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
+++ b/rhino-impl/src/main/java/net/shibboleth/idp/plugin/scripting/rhino/RhinoPlugin.java
@@ -19,17 +19,17 @@ package net.shibboleth.idp.plugin.scripting.rhino;
import java.io.IOException;
-import net.shibboleth.idp.plugin.PluginException;
-import net.shibboleth.idp.plugin.PropertyDrivenIdPPlugin;
import net.shibboleth.idp.plugin.impl.FirstPartyIdPPlugin;
+import net.shibboleth.profile.plugin.PluginException;
/**
* Details about the Rhino scripting plugin.
*/
public class RhinoPlugin extends FirstPartyIdPPlugin {
/** Constructor.
- * @throws PluginException from {@link PropertyDrivenIdPPlugin}
- * @throws IOException {@link PropertyDrivenIdPPlugin} */
+ * @throws PluginException from {@link FirstPartyIdPPlugin}
+ * @throws IOException from {@link FirstPartyIdPPlugin}
+ */
public RhinoPlugin() throws IOException, PluginException {
super(RhinoPlugin.class);
}
diff --git a/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
index 1b85e9d..7aa8444 100644
--- a/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
+++ b/scripting-api/src/main/java/net/shibboleth/idp/plugin/scripting/AbstractScriptEngineFactory.java
@@ -20,6 +20,7 @@ package net.shibboleth.idp.plugin.scripting;
import java.util.Collections;
import java.util.List;
+import javax.annotation.Nonnull;
import javax.script.ScriptEngineFactory;
/**
@@ -28,13 +29,13 @@ import javax.script.ScriptEngineFactory;
public abstract class AbstractScriptEngineFactory implements ScriptEngineFactory {
/** {@inheritDoc} */
- public String getEngineName() {
+ @Nonnull public String getEngineName() {
return this.getClass().getCanonicalName();
}
/** {@inheritDoc} */
- public List<String> getExtensions() {
+ @Nonnull public List<String> getExtensions() {
return List.of("js","nashorn-js");
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list