[java-shib-shared] 02/02: IDP-2044 Scripted object constructors and initialization
Rod Widdowson
rdw at steadingsoftware.com
Wed Jun 21 09:55:59 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw 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=915f9fabebbb95067575bbc17265c78131d2a519
commit 915f9fabebbb95067575bbc17265c78131d2a519
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Jun 21 10:52:18 2023 +0100
IDP-2044 Scripted object constructors and initialization
https://shibboleth.atlassian.net/browse/IDP-2044
Re-enable warbings on use of deprecated functions.
---
.../src/main/java/net/shibboleth/shared/logic/ScriptedBiConsumer.java | 3 ---
.../src/main/java/net/shibboleth/shared/logic/ScriptedBiFunction.java | 3 ---
.../src/main/java/net/shibboleth/shared/logic/ScriptedBiPredicate.java | 3 ---
.../src/main/java/net/shibboleth/shared/logic/ScriptedConsumer.java | 3 ---
.../src/main/java/net/shibboleth/shared/logic/ScriptedFunction.java | 3 ---
.../src/main/java/net/shibboleth/shared/logic/ScriptedPredicate.java | 3 ---
6 files changed, 18 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 17620ece..77340043 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
@@ -138,7 +138,6 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedBiConsumer<T,U> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
@@ -179,7 +178,6 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedBiConsumer<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript();
@@ -200,7 +198,6 @@ public class ScriptedBiConsumer<T,U> extends AbstractScriptEvaluator implements
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedBiConsumer<T,U> inlineScript(@Nonnull @NotEmpty final String scriptSource)
throws ScriptException {
final EvaluableScript script = new EvaluableScript();
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 b6944aa3..fd154613 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
@@ -159,7 +159,6 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- @SuppressWarnings("removal")
public static <T,U,V> ScriptedBiFunction<T,U,V> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
@@ -202,7 +201,6 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U,V> ScriptedBiFunction<T,U,V> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript();
@@ -224,7 +222,6 @@ public class ScriptedBiFunction<T,U,V> extends AbstractScriptEvaluator implement
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U,V> ScriptedBiFunction<T,U,V> inlineScript(@Nonnull @NotEmpty final String scriptSource)
throws ScriptException {
final EvaluableScript script = new EvaluableScript();
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 d08e973a..07b3691f 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
@@ -167,7 +167,6 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedBiPredicate<T,U> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
@@ -208,7 +207,6 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedBiPredicate<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript();
@@ -229,7 +227,6 @@ public class ScriptedBiPredicate<T,U> extends AbstractScriptEvaluator implements
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedBiPredicate<T,U> inlineScript(@Nonnull @NotEmpty final String scriptSource)
throws ScriptException {
final EvaluableScript script = new EvaluableScript();
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 dcd56630..839f12b0 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
@@ -119,7 +119,6 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- @SuppressWarnings("removal")
public static <T> ScriptedConsumer<T> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
@@ -158,7 +157,6 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T> ScriptedConsumer<T> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript();
@@ -178,7 +176,6 @@ public class ScriptedConsumer<T> extends AbstractScriptEvaluator implements Cons
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T> ScriptedConsumer<T> inlineScript(@Nonnull @NotEmpty final String scriptSource)
throws ScriptException {
final EvaluableScript script = new EvaluableScript();
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 43991788..9ab4fc2e 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
@@ -141,7 +141,6 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedFunction<T,U> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
@@ -182,7 +181,6 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedFunction<T,U> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript();
@@ -203,7 +201,6 @@ public class ScriptedFunction<T, U> extends AbstractScriptEvaluator implements F
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T,U> ScriptedFunction<T,U> inlineScript(@Nonnull @NotEmpty final String scriptSource)
throws ScriptException {
final EvaluableScript script = new EvaluableScript();
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 699d1e6a..86e70866 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
@@ -156,7 +156,6 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
* @throws ScriptException if the compile fails
* @throws IOException if the file doesn't exist.
*/
- @SuppressWarnings("removal")
public static <T> ScriptedPredicate<T> resourceScript(@Nonnull @NotEmpty final String engineName,
@Nonnull final Resource resource) throws ScriptException, IOException {
try (final InputStream is = resource.getInputStream()) {
@@ -195,7 +194,6 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String engineName,
@Nonnull @NotEmpty final String scriptSource) throws ScriptException {
final EvaluableScript script = new EvaluableScript();
@@ -215,7 +213,6 @@ public class ScriptedPredicate<T> extends AbstractScriptEvaluator implements Pre
*
* @throws ScriptException if the compile fails
*/
- @SuppressWarnings("removal")
public static <T> ScriptedPredicate<T> inlineScript(@Nonnull @NotEmpty final String scriptSource)
throws ScriptException {
final EvaluableScript script = new EvaluableScript();
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list