[java-shib-shared] branch main updated: Add ParameterName annotations to factory methods.
Scott Cantor
cantor.2 at osu.edu
Wed Aug 2 19:59:13 UTC 2023
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch main
in repository java-shib-shared.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-shared.git;a=commit;h=b61bd7bd5f286716926d105c50296e4d1c07b86b
The following commit(s) were added to refs/heads/main by this push:
new b61bd7bd Add ParameterName annotations to factory methods.
b61bd7bd is described below
commit b61bd7bd5f286716926d105c50296e4d1c07b86b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 2 15:59:09 2023 -0400
Add ParameterName annotations to factory methods.
---
.../shared/logic/ScriptedBiConsumer.java | 29 ++++++++++++--------
.../shared/logic/ScriptedBiFunction.java | 29 ++++++++++++--------
.../shared/logic/ScriptedBiPredicate.java | 29 ++++++++++++--------
.../shibboleth/shared/logic/ScriptedConsumer.java | 31 +++++++++++++---------
.../shibboleth/shared/logic/ScriptedFunction.java | 29 ++++++++++++--------
.../shibboleth/shared/logic/ScriptedPredicate.java | 28 +++++++++++--------
6 files changed, 108 insertions(+), 67 deletions(-)
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
index bca8d9f1..a7e9807d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java
@@ -56,8 +56,8 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
* @param theScript the script we will evaluate.
* @param extraInfo debugging information.
*/
- protected ScriptedBiConsumer(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript,
- @Nullable @NotEmpty @ParameterName(name="extraInfo") final String extraInfo) {
+ protected ScriptedBiConsumer(@Nonnull @NotEmpty final EvaluableScript theScript,
+ @Nullable @NotEmpty final String extraInfo) {
super(theScript);
setLogPrefix("Scripted BiConsumer from " + extraInfo + ":");
}
@@ -67,7 +67,7 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
*
* @param theScript the script we will evaluate.
*/
- protected ScriptedBiConsumer(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript) {
+ protected ScriptedBiConsumer(@Nonnull @NotEmpty final EvaluableScript theScript) {
super(theScript);
setLogPrefix("Anonymous BiConsumer:");
}
@@ -137,8 +137,10 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedBiConsumer<T,U> resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiConsumer<T,U> 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);
@@ -161,8 +163,9 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedBiConsumer<T,U> resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiConsumer<T,U> resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -179,8 +182,10 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedBiConsumer<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiConsumer<T,U> 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);
@@ -200,11 +205,13 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting goes weird
*/
- public static <T,U> ScriptedBiConsumer<T,U> inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiConsumer<T,U> inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setScript(scriptSource);
script.initialize();
return new ScriptedBiConsumer<>(script, "Inline");
}
+
}
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
index fb8e9a7e..28b7326b 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java
@@ -57,8 +57,8 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
* @param theScript the script we will evaluate.
* @param extraInfo debugging information.
*/
- protected ScriptedBiFunction(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript,
- @Nullable @NotEmpty @ParameterName(name="extraInfo") final String extraInfo) {
+ protected ScriptedBiFunction(@Nonnull @NotEmpty final EvaluableScript theScript,
+ @Nullable @NotEmpty final String extraInfo) {
super(theScript);
setLogPrefix("Scripted BiFunction from " + extraInfo + ":");
}
@@ -68,7 +68,7 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
*
* @param theScript the script we will evaluate.
*/
- protected ScriptedBiFunction(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript) {
+ protected ScriptedBiFunction(@Nonnull @NotEmpty final EvaluableScript theScript) {
super(theScript);
setLogPrefix("Anonymous BiFunction:");
}
@@ -158,8 +158,10 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U,V> ScriptedBiFunction<T,U,V> resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U,V> ScriptedBiFunction<T,U,V> 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);
@@ -183,8 +185,9 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U,V> ScriptedBiFunction<T,U,V> resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U,V> ScriptedBiFunction<T,U,V> resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -202,8 +205,10 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U,V> ScriptedBiFunction<T,U,V> inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U,V> ScriptedBiFunction<T,U,V> 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);
@@ -224,11 +229,13 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U,V> ScriptedBiFunction<T,U,V> inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U,V> ScriptedBiFunction<T,U,V> inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setScript(scriptSource);
script.initialize();
return new ScriptedBiFunction<>(script, "Inline");
}
+
}
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
index f013fca2..a8e3e755 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java
@@ -56,8 +56,8 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
* @param theScript the script we will evaluate.
* @param extraInfo debugging information.
*/
- protected ScriptedBiPredicate(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript,
- @Nullable @NotEmpty @ParameterName(name="extraInfo") final String extraInfo) {
+ protected ScriptedBiPredicate(@Nonnull @NotEmpty final EvaluableScript theScript,
+ @Nullable @NotEmpty final String extraInfo) {
super(theScript);
setOutputType(Boolean.class);
setReturnOnError(false);
@@ -69,7 +69,7 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
*
* @param theScript the script we will evaluate.
*/
- protected ScriptedBiPredicate(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript) {
+ protected ScriptedBiPredicate(@Nonnull @NotEmpty final EvaluableScript theScript) {
super(theScript);
setOutputType(Boolean.class);
setReturnOnError(false);
@@ -166,8 +166,10 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedBiPredicate<T,U> resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiPredicate<T,U> 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);
@@ -190,8 +192,9 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedBiPredicate<T,U> resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiPredicate<T,U> resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -208,8 +211,10 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedBiPredicate<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiPredicate<T,U> 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);
@@ -229,11 +234,13 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedBiPredicate<T,U> inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedBiPredicate<T,U> inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setScript(scriptSource);
script.initialize();
return new ScriptedBiPredicate<>(script, "Inline");
}
+
}
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
index 21721474..ca8fdf09 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java
@@ -54,8 +54,8 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
* @param theScript the script we will evaluate.
* @param extraInfo debugging information.
*/
- protected ScriptedConsumer(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript,
- @Nullable @NotEmpty @ParameterName(name="extraInfo") final String extraInfo) {
+ protected ScriptedConsumer(@Nonnull @NotEmpty final EvaluableScript theScript,
+ @Nullable @NotEmpty final String extraInfo) {
super(theScript);
setLogPrefix("Scripted Consumer from " + extraInfo + ":");
}
@@ -65,7 +65,7 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
*
* @param theScript the script we will evaluate.
*/
- protected ScriptedConsumer(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript) {
+ protected ScriptedConsumer(@Nonnull @NotEmpty final EvaluableScript theScript) {
super(theScript);
setLogPrefix("Anonymous Consumer:");
}
@@ -75,7 +75,7 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
*
* @return input type
*/
- @Nullable public Class<T> getInputType() {
+ @Nullable public Class<T> getInputType() {
return inputTypeClass;
}
@@ -118,8 +118,10 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedConsumer<T> resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedConsumer<T> 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);
@@ -141,8 +143,9 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedConsumer<T> resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedConsumer<T> resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -158,8 +161,10 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedConsumer<T> inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedConsumer<T> 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);
@@ -178,11 +183,13 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedConsumer<T> inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedConsumer<T> inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setScript(scriptSource);
script.initialize();
return new ScriptedConsumer<>(script, "Inline");
}
+
}
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
index 565dfae8..f67fed9d 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java
@@ -55,8 +55,8 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
* @param theScript the script we will evaluate.
* @param extraInfo debugging information.
*/
- protected ScriptedFunction(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript,
- @Nullable @NotEmpty @ParameterName(name="extraInfo") final String extraInfo) {
+ protected ScriptedFunction(@Nonnull @NotEmpty final EvaluableScript theScript,
+ @Nullable @NotEmpty final String extraInfo) {
super(theScript);
setLogPrefix("Scripted Function from " + extraInfo + ":");
}
@@ -66,7 +66,7 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
*
* @param theScript the script we will evaluate.
*/
- protected ScriptedFunction(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript) {
+ protected ScriptedFunction(@Nonnull @NotEmpty final EvaluableScript theScript) {
super(theScript);
setLogPrefix("Anonymous Function:");
}
@@ -140,8 +140,10 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedFunction<T,U> resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedFunction<T,U> 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);
@@ -164,8 +166,9 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedFunction<T,U> resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedFunction<T,U> resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -182,8 +185,10 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedFunction<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedFunction<T,U> 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);
@@ -203,11 +208,13 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T,U> ScriptedFunction<T,U> inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T,U> ScriptedFunction<T,U> inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setScript(scriptSource);
script.initialize();
return new ScriptedFunction<>(script, "Inline");
}
+
}
\ No newline at end of file
diff --git a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
index 73e50864..531aaad0 100644
--- a/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
+++ b/shib-support/src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java
@@ -55,8 +55,8 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
* @param theScript the script we will evaluate.
* @param extraInfo debugging information.
*/
- protected ScriptedPredicate(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript,
- @Nullable @NotEmpty @ParameterName(name="extraInfo") final String extraInfo) {
+ protected ScriptedPredicate(@Nonnull @NotEmpty final EvaluableScript theScript,
+ @Nullable @NotEmpty final String extraInfo) {
super(theScript);
setOutputType(Boolean.class);
setReturnOnError(false);
@@ -68,7 +68,7 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
*
* @param theScript the script we will evaluate.
*/
- protected ScriptedPredicate(@Nonnull @NotEmpty @ParameterName(name="theScript") final EvaluableScript theScript) {
+ protected ScriptedPredicate(@Nonnull @NotEmpty final EvaluableScript theScript) {
super(theScript);
setLogPrefix("Anonymous Scripted Predicate:");
setOutputType(Boolean.class);
@@ -155,8 +155,10 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedPredicate<T> resourceScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedPredicate<T> 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);
@@ -178,8 +180,9 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedPredicate<T> resourceScript(@Nonnull final Resource resource)
- throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedPredicate<T> resourceScript(
+ @Nonnull @ParameterName(name="resource") final Resource resource)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceScript(DEFAULT_ENGINE, resource);
}
@@ -195,8 +198,10 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String engineName,
- @Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedPredicate<T> 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);
@@ -215,8 +220,9 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- public static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String scriptSource)
- throws ScriptException, ComponentInitializationException {
+ @Nonnull public static <T> ScriptedPredicate<T> inlineScript(
+ @Nonnull @NotEmpty @ParameterName(name="scriptSource") final String scriptSource)
+ throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
script.setEngineName(DEFAULT_ENGINE);
script.setScript(scriptSource);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list