[java-shib-shared] branch main updated: Move Spring expression support to new package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 14 16:47:51 UTC 2022
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=2b8ab3735e834aa91d338da8098a0302e3a00f0a
The following commit(s) were added to refs/heads/main by this push:
new 2b8ab373 Move Spring expression support to new package.
2b8ab373 is described below
commit 2b8ab3735e834aa91d338da8098a0302e3a00f0a
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 14 12:47:48 2022 -0400
Move Spring expression support to new package.
---
.../AbstractSpringExpressionEvaluator.java | 2 +-
.../expression}/SpringExpressionBiConsumer.java | 2 +-
.../expression}/SpringExpressionBiFunction.java | 2 +-
.../expression}/SpringExpressionBiPredicate.java | 2 +-
.../expression}/SpringExpressionConsumer.java | 2 +-
.../expression}/SpringExpressionFunction.java | 2 +-
.../expression}/SpringExpressionPredicate.java | 2 +-
.../shared/spring/expression/package-info.java | 21 +++++++++++++++++++++
.../spring/expression}/SpringExpressionTest.java | 2 +-
9 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/AbstractSpringExpressionEvaluator.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
similarity index 99%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/AbstractSpringExpressionEvaluator.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
index 6faede85..ad7df9f2 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/AbstractSpringExpressionEvaluator.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/AbstractSpringExpressionEvaluator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiConsumer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiConsumer.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
index c72a557a..b05a928e 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiConsumer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiConsumer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import java.util.function.BiConsumer;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiFunction.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiFunction.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
index e41218c1..21665305 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiFunction.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import java.util.function.BiFunction;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiPredicate.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
index 70398b77..cbde285c 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionBiPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionBiPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import java.util.function.BiPredicate;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionConsumer.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionConsumer.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
index 894248a3..a6badd83 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionConsumer.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionConsumer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import java.util.function.Consumer;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionFunction.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionFunction.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
index c20b16f1..aa6e5305 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionFunction.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import java.util.function.Function;
diff --git a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionPredicate.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
similarity index 98%
rename from shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionPredicate.java
rename to shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
index 8e0a7eb4..a399bd02 100644
--- a/shib-spring/src/main/java/net/shibboleth/ext/spring/util/SpringExpressionPredicate.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/SpringExpressionPredicate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/package-info.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/package-info.java
new file mode 100644
index 00000000..73a9dcf0
--- /dev/null
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/expression/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the University Corporation for Advanced Internet Development,
+ * Inc. (UCAID) under one or more contributor license agreements. See the
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Classes supporting use of Spring Expression Language (SpEL).
+ */
+package net.shibboleth.shared.spring.expression;
\ No newline at end of file
diff --git a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/SpringExpressionTest.java b/shib-spring/src/test/java/net/shibboleth/shared/spring/expression/SpringExpressionTest.java
similarity index 98%
rename from shib-spring/src/test/java/net/shibboleth/ext/spring/util/SpringExpressionTest.java
rename to shib-spring/src/test/java/net/shibboleth/shared/spring/expression/SpringExpressionTest.java
index 394043a1..4d8c3671 100644
--- a/shib-spring/src/test/java/net/shibboleth/ext/spring/util/SpringExpressionTest.java
+++ b/shib-spring/src/test/java/net/shibboleth/shared/spring/expression/SpringExpressionTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.ext.spring.util;
+package net.shibboleth.shared.spring.expression;
import java.util.HashMap;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list