[java-shib-profile] branch main updated: IDP-2044 - Scripted object constructors and initialization
Scott Cantor
cantor.2 at osu.edu
Wed Aug 2 19:00:20 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-profile.
View the commit online:
http://git.shibboleth.net/view/?p=java-shib-profile.git;a=commit;h=12f86484ea5b52f1fcaa84fd3e8e066ed3f5975b
The following commit(s) were added to refs/heads/main by this push:
new 12f8648 IDP-2044 - Scripted object constructors and initialization
12f8648 is described below
commit 12f86484ea5b52f1fcaa84fd3e8e066ed3f5975b
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Aug 2 15:00:17 2023 -0400
IDP-2044 - Scripted object constructors and initialization
https://shibboleth.atlassian.net/browse/IDP-2044
Eliminate more re-wrapping of initialization exceptions.
---
.../navigate/ScriptedContextLookupFunction.java | 51 +++++++++-------------
1 file changed, 20 insertions(+), 31 deletions(-)
diff --git a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java
index e28e3bc..ad7aed7 100644
--- a/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java
+++ b/shib-profile-api/src/main/java/net/shibboleth/profile/context/navigate/ScriptedContextLookupFunction.java
@@ -122,8 +122,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(
+ @Nonnull public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(
@Nonnull @NotEmpty final String engineName, @Nonnull final Resource resource) throws ScriptException,
IOException, ComponentInitializationException {
return resourceScript(engineName, resource, null);
@@ -141,8 +140,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(
+ @Nonnull public static ScriptedContextLookupFunction<ProfileRequestContext> resourceScript(
@Nonnull @NotEmpty final String engineName, @Nonnull final Resource resource,
@Nullable final Class<?> outputType) throws ScriptException, IOException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
@@ -194,8 +192,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
+ @Nonnull public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
@Nonnull @NotEmpty final String engineName, @Nonnull @NotEmpty final String scriptSource)
throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
@@ -215,8 +212,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
+ @Nonnull public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
@Nonnull @NotEmpty final String engineName, @Nonnull @NotEmpty final String scriptSource,
@Nullable final Class<?> outputType) throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
@@ -234,8 +230,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
+ @Nonnull public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
@Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
return inlineScript(DEFAULT_ENGINE, scriptSource);
}
@@ -249,9 +244,9 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
- @Nonnull @NotEmpty final String scriptSource, @Nullable final Class<?> outputType) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static ScriptedContextLookupFunction<ProfileRequestContext> inlineScript(
+ @Nonnull @NotEmpty final String scriptSource, @Nullable final Class<?> outputType)
+ throws ScriptException, ComponentInitializationException {
return inlineScript(DEFAULT_ENGINE, scriptSource, outputType);
}
@@ -265,8 +260,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
@Nonnull @NotEmpty final String engineName, @Nonnull final Resource resource) throws ScriptException,
IOException, ComponentInitializationException {
return resourceMessageContextScript(engineName, resource, null);
@@ -283,8 +277,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
@Nonnull @NotEmpty final String engineName, @Nonnull final Resource resource,
@Nullable final Class<?> outputType) throws ScriptException, IOException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
@@ -304,8 +297,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
@Nonnull final Resource resource) throws ScriptException, IOException, ComponentInitializationException {
return resourceMessageContextScript(DEFAULT_ENGINE, resource, null);
}
@@ -320,9 +312,9 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws IOException if the file doesn't exist.
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
- @Nonnull final Resource resource, @Nullable final Class<?> outputType) throws ScriptException, IOException, ComponentInitializationException {
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> resourceMessageContextScript(
+ @Nonnull final Resource resource, @Nullable final Class<?> outputType)
+ throws ScriptException, IOException, ComponentInitializationException {
return resourceMessageContextScript(DEFAULT_ENGINE, resource, outputType);
}
@@ -335,8 +327,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
@Nonnull @NotEmpty final String engineName, @Nonnull @NotEmpty final String scriptSource)
throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
@@ -356,8 +347,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
@Nonnull @NotEmpty final String engineName, @Nonnull @NotEmpty final String scriptSource,
@Nullable final Class<?> outputType) throws ScriptException, ComponentInitializationException {
final EvaluableScript script = new EvaluableScript();
@@ -375,8 +365,7 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
@Nonnull @NotEmpty final String scriptSource) throws ScriptException, ComponentInitializationException {
return inlineMessageContextScript(DEFAULT_ENGINE, scriptSource);
}
@@ -390,9 +379,9 @@ public class ScriptedContextLookupFunction<T extends BaseContext> extends Abstra
* @throws ScriptException if the compile fails
* @throws ComponentInitializationException if the scripting initialization fails
*/
- @Nonnull
- public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
- @Nonnull @NotEmpty final String scriptSource, @Nullable final Class<?> outputType) throws ScriptException, ComponentInitializationException {
+ @Nonnull public static ScriptedContextLookupFunction<MessageContext> inlineMessageContextScript(
+ @Nonnull @NotEmpty final String scriptSource, @Nullable final Class<?> outputType)
+ throws ScriptException, ComponentInitializationException {
return inlineMessageContextScript(DEFAULT_ENGINE, scriptSource, outputType);
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list