[java-shib-shared] branch main updated: Rename shared net packages, move several classes into impl.
Scott Cantor
cantor.2 at osu.edu
Tue Sep 20 18:10:35 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=a8a98f72d4a01abad14a8b63fd511ad512681e39
The following commit(s) were added to refs/heads/main by this push:
new a8a98f72 Rename shared net packages, move several classes into impl.
a8a98f72 is described below
commit a8a98f72d4a01abad14a8b63fd511ad512681e39
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 20 14:10:33 2022 -0400
Rename shared net packages, move several classes into impl.
---
.../java/support => shared}/net/CookieManager.java | 2 +-
.../support => shared}/net/HttpServletSupport.java | 4 ++--
.../java/support => shared}/net/IPRange.java | 2 +-
.../java/support => shared}/net/MediaTypeSupport.java | 5 +++--
.../support => shared}/net/SimpleURLCanonicalizer.java | 2 +-
.../java/support => shared}/net/URIComparator.java | 2 +-
.../java/support => shared}/net/URIException.java | 2 +-
.../java/support => shared}/net/URISupport.java | 2 +-
.../java/support => shared}/net/URLBuilder.java | 2 +-
.../shibboleth/shared/net/impl/BasicURLComparator.java | 6 +++---
.../net/impl}/HttpServletRequestResponseContext.java | 3 ++-
.../net/impl}/StripMediaTypeParametersFunction.java | 2 +-
.../net/impl}/ThreadLocalHttpServletRequestProxy.java | 2 +-
.../impl}/ThreadLocalHttpServletRequestSupplier.java | 4 ++--
.../net/impl}/ThreadLocalHttpServletResponseProxy.java | 2 +-
.../impl}/ThreadLocalHttpServletResponseSupplier.java | 4 ++--
.../java/net/shibboleth/shared/net/package-info.java | 18 ++----------------
.../java/support/net/RequestResponseContextFilter.java | 1 +
.../utilities/java/support/net/CookieManagerTest.java | 1 +
.../net/HttpServletRequestResponseContextTest.java | 1 +
.../java/support/net/HttpServletSupportTest.java | 2 ++
.../utilities/java/support/net/IPRangeTest.java | 2 ++
.../java/support/net/MediaTypeSupportTest.java | 2 ++
.../support/net/RequestResponseContextFilterTest.java | 1 +
.../support/net/SameSiteCookieHeaderFilterTest.java | 1 +
.../java/support/net/SimpleURLCanonicalizerTest.java | 5 +++--
.../net/ThreadLocalHttpServletRequestProxyTest.java | 2 ++
.../net/ThreadLocalHttpServletResponseProxyTest.java | 2 ++
.../utilities/java/support/net/URISupportTest.java | 1 +
.../utilities/java/support/net/URLBuilderTest.java | 2 +-
.../support/security/impl/IPRangeAccessControl.java | 4 ++--
.../shared/spring/config/StringToIPRangeConverter.java | 4 ++--
.../shibboleth/shared/spring/util/SpringSupport.java | 2 +-
33 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
index a8eff62b..7116b717 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/CookieManager.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/CookieManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.util.function.Supplier;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/net/HttpServletSupport.java
similarity index 98%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/HttpServletSupport.java
index 6698486c..e3366de8 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/HttpServletSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.net.URI;
import java.util.Collections;
@@ -165,7 +165,7 @@ public final class HttpServletSupport {
LOG.warn("Could not parse provided languages '{}'", languages, e);
}
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
/**
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java b/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
index f99a3846..105dc04e 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/IPRange.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/IPRange.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/MediaTypeSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/net/MediaTypeSupport.java
similarity index 96%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/MediaTypeSupport.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/MediaTypeSupport.java
index c6a4c289..bb169956 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/MediaTypeSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/MediaTypeSupport.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.util.Set;
import java.util.function.Function;
import com.google.common.net.MediaType;
+import net.shibboleth.shared.net.impl.StripMediaTypeParametersFunction;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
@@ -33,7 +34,7 @@ public final class MediaTypeSupport {
private static final Function<MediaType,MediaType> STRIP_PARAMS = new StripMediaTypeParametersFunction();
/** * Constructor. */
- private MediaTypeSupport() { }
+ private MediaTypeSupport() {}
/**
* Validate the specified Content-Type.
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java b/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
similarity index 98%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
index 1301270b..8e6bd610 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizer.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/SimpleURLCanonicalizer.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.net.MalformedURLException;
import java.util.HashMap;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URIComparator.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URIComparator.java
similarity index 96%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URIComparator.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/URIComparator.java
index 28e2dba7..21887b2a 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URIComparator.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URIComparator.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import javax.annotation.Nullable;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URIException.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URIException.java
similarity index 97%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URIException.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/URIException.java
index 69948260..9793b171 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URIException.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URIException.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import javax.annotation.Nullable;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
index e85fb7c1..a1131c8a 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URISupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URISupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.io.UnsupportedEncodingException;
import java.net.URI;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
index 682bcb79..92550d7e 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/URLBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/URLBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.net.MalformedURLException;
import java.net.URL;
diff --git a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java
index b0c15165..4449ae26 100644
--- a/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/BasicURLComparator.java
@@ -21,9 +21,9 @@ import java.net.MalformedURLException;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.net.SimpleURLCanonicalizer;
-import net.shibboleth.utilities.java.support.net.URIComparator;
-import net.shibboleth.utilities.java.support.net.URIException;
+import net.shibboleth.shared.net.SimpleURLCanonicalizer;
+import net.shibboleth.shared.net.URIComparator;
+import net.shibboleth.shared.net.URIException;
/**
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContext.java
similarity index 96%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContext.java
index c0fde45c..ece92f8e 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContext.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContext.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -23,6 +23,7 @@ import javax.annotation.Nullable;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.net.RequestResponseContextFilter;
/**
* Class which holds and makes available the current HTTP servlet request and response via ThreadLocal storage.
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/StripMediaTypeParametersFunction.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/StripMediaTypeParametersFunction.java
similarity index 96%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/StripMediaTypeParametersFunction.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/impl/StripMediaTypeParametersFunction.java
index 74217617..c8d2e1b2 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/StripMediaTypeParametersFunction.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/StripMediaTypeParametersFunction.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
import java.util.function.Function;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxy.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxy.java
index d4bb41dd..79057c33 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxy.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestSupplier.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestSupplier.java
similarity index 91%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestSupplier.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestSupplier.java
index 6493a685..2cef3dc0 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestSupplier.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestSupplier.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
import java.util.function.Supplier;
@@ -23,7 +23,7 @@ import jakarta.servlet.http.HttpServletRequest;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
- * An implementation of {@link Supplier<HttpServletRequest>} which looks up the current thread-local
+ * An implementation of {@link Supplier} which looks up the current thread-local
* servlet request obtained from {@link HttpServletRequestResponseContext}.
*/
public class ThreadLocalHttpServletRequestSupplier implements Supplier<HttpServletRequest> {
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxy.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxy.java
index 68ddeb8c..dcff134b 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxy.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxy.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
import java.io.IOException;
import java.io.PrintWriter;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseSupplier.java b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseSupplier.java
similarity index 91%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseSupplier.java
rename to shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseSupplier.java
index 7180f8d0..aae9b19e 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseSupplier.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseSupplier.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
import java.util.function.Supplier;
@@ -23,7 +23,7 @@ import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.utilities.java.support.logic.Constraint;
/**
- * An implementation of {@link Supplier<HttpServletResponse>} which looks up the current thread-local
+ * An implementation of {@link Supplier} which looks up the current thread-local
* servlet response obtained from {@link HttpServletRequestResponseContext}.
*/
public class ThreadLocalHttpServletResponseSupplier implements Supplier<HttpServletResponse> {
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java b/shib-networking/src/main/java/net/shibboleth/shared/net/package-info.java
similarity index 65%
copy from shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
copy to shib-networking/src/main/java/net/shibboleth/shared/net/package-info.java
index 8c01d74e..1d012f96 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/net/package-info.java
@@ -15,21 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.shared.spring.config;
-
-import net.shibboleth.utilities.java.support.net.IPRange;
-
-import org.springframework.core.convert.converter.Converter;
-
-
/**
- * Allows setting of {@link IPRange} properties using a CIDR string.
+ * Shared networking APIs and classes.
*/
-public class StringToIPRangeConverter implements Converter<String,IPRange> {
-
- /** {@inheritDoc} */
- public IPRange convert(final String source) {
- return IPRange.parseCIDRBlock(source);
- }
-
-}
\ No newline at end of file
+package net.shibboleth.shared.net;
\ No newline at end of file
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
index 650853ca..0d60f2d1 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilter.java
@@ -27,6 +27,7 @@ import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.net.impl.HttpServletRequestResponseContext;
/**
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
index 4a69397d..a362d2e3 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
@@ -19,6 +19,7 @@ package net.shibboleth.utilities.java.support.net;
import java.util.function.Supplier;
+import net.shibboleth.shared.net.CookieManager;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
index c8d0059c..803bd24f 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
@@ -26,6 +26,7 @@ import org.testng.annotations.Test;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.net.impl.HttpServletRequestResponseContext;
/**
* Tests for {@link HttpServletRequestResponseContext}.
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
index e8010638..962bd14d 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
@@ -29,6 +29,8 @@ import org.testng.annotations.Test;
import com.google.common.net.MediaType;
+import net.shibboleth.shared.net.HttpServletSupport;
+
/** {@link HttpServletSupport} unit test. */
@SuppressWarnings("javadoc")
public class HttpServletSupportTest {
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
index 0d83835d..083cb2ae 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
@@ -23,6 +23,8 @@ import java.net.InetAddress;
import org.testng.Assert;
import org.testng.annotations.Test;
+import net.shibboleth.shared.net.IPRange;
+
public class IPRangeTest {
@Test public void testValidV4Addresses() {
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/MediaTypeSupportTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/MediaTypeSupportTest.java
index d21694a5..f990e992 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/MediaTypeSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/MediaTypeSupportTest.java
@@ -24,6 +24,8 @@ import org.testng.annotations.Test;
import com.google.common.net.MediaType;
+import net.shibboleth.shared.net.MediaTypeSupport;
+
/**
*
*/
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
index 01a793b6..24fdb813 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
@@ -37,6 +37,7 @@ import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.net.impl.HttpServletRequestResponseContext;
/**
* Tests for {@link RequestResponseContextFilter}.
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
index 979006d0..97996d80 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
@@ -49,6 +49,7 @@ import jakarta.servlet.ServletRequest;
import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletResponse;
+import net.shibboleth.shared.net.impl.HttpServletRequestResponseContext;
import net.shibboleth.utilities.java.support.net.SameSiteCookieHeaderFilter.SameSiteValue;
/**
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
index ff380158..149ad0de 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
@@ -17,10 +17,11 @@
package net.shibboleth.utilities.java.support.net;
-import net.shibboleth.utilities.java.support.net.SimpleURLCanonicalizer;
-
import org.testng.Assert;
import org.testng.annotations.Test;
+
+import net.shibboleth.shared.net.SimpleURLCanonicalizer;
+
import java.net.MalformedURLException;
/**
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
index 15e8c02e..fb94b6ea 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
@@ -17,6 +17,8 @@
package net.shibboleth.utilities.java.support.net;
+import net.shibboleth.shared.net.impl.HttpServletRequestResponseContext;
+import net.shibboleth.shared.net.impl.ThreadLocalHttpServletRequestProxy;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
index e2ff20d8..a7838cae 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
@@ -17,6 +17,8 @@
package net.shibboleth.utilities.java.support.net;
+import net.shibboleth.shared.net.impl.HttpServletRequestResponseContext;
+import net.shibboleth.shared.net.impl.ThreadLocalHttpServletResponseProxy;
import net.shibboleth.utilities.java.support.logic.ConstraintViolationException;
import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
index fe6b1b55..e6272a83 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
@@ -22,6 +22,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import net.shibboleth.shared.net.URISupport;
import net.shibboleth.utilities.java.support.collection.Pair;
import org.testng.Assert;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
index 5a19b740..3048c1c5 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
@@ -19,8 +19,8 @@ package net.shibboleth.utilities.java.support.net;
import java.net.MalformedURLException;
+import net.shibboleth.shared.net.URLBuilder;
import net.shibboleth.utilities.java.support.collection.Pair;
-import net.shibboleth.utilities.java.support.net.URLBuilder;
import org.testng.annotations.Test;
import org.testng.Assert;
diff --git a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java b/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
index 0e0491c1..60417607 100644
--- a/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
+++ b/shib-security/src/main/java/net/shibboleth/utilities/java/support/security/impl/IPRangeAccessControl.java
@@ -30,11 +30,11 @@ import org.slf4j.LoggerFactory;
import com.google.common.net.InetAddresses;
import jakarta.servlet.ServletRequest;
+import net.shibboleth.shared.net.HttpServletSupport;
+import net.shibboleth.shared.net.IPRange;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiableInitializableComponent;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.net.HttpServletSupport;
-import net.shibboleth.utilities.java.support.net.IPRange;
import net.shibboleth.utilities.java.support.security.AccessControl;
/**
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
index 8c01d74e..b2d8ad26 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/config/StringToIPRangeConverter.java
@@ -17,10 +17,10 @@
package net.shibboleth.shared.spring.config;
-import net.shibboleth.utilities.java.support.net.IPRange;
-
import org.springframework.core.convert.converter.Converter;
+import net.shibboleth.shared.net.IPRange;
+
/**
* Allows setting of {@link IPRange} properties using a CIDR string.
diff --git a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
index 7d059012..ac4805bc 100644
--- a/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
+++ b/shib-spring/src/main/java/net/shibboleth/shared/spring/util/SpringSupport.java
@@ -49,11 +49,11 @@ import org.xml.sax.InputSource;
import com.google.common.base.Strings;
import jakarta.servlet.http.HttpServletRequest;
+import net.shibboleth.shared.net.HttpServletSupport;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
import net.shibboleth.utilities.java.support.annotation.constraint.Unmodifiable;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.net.HttpServletSupport;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
import net.shibboleth.utilities.java.support.xml.SerializeSupport;
import net.shibboleth.utilities.java.support.xml.XMLConstants;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list