[java-shib-shared] branch main updated: Rename httpclient package.
Scott Cantor
cantor.2 at osu.edu
Wed Sep 21 15:13:10 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=f861eac7de29e9bd570385a0f5f05b560e04b094
The following commit(s) were added to refs/heads/main by this push:
new f861eac7 Rename httpclient package.
f861eac7 is described below
commit f861eac7de29e9bd570385a0f5f05b560e04b094
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Sep 21 11:12:35 2022 -0400
Rename httpclient package.
---
.../factory/FileCachingHttpClientFactoryBean.java | 2 +-
.../httpclient/factory/HttpClientFactoryBean.java | 4 +-
.../InMemoryCachingHttpClientFactoryBean.java | 2 +-
.../spring/httpclient/resource/HTTPResource.java | 2 +-
.../resource/ConditionalResourceTest.java | 4 +-
.../resource/FileBackedHTTPResourceTest.java | 2 +-
.../httpclient/resource/HTTPResourceTest.java | 6 +-
.../httpclient/resource/FileBackedHTTPBean.xml | 2 +-
.../httpclient/resource/MemBackedHTTPBean.xml | 2 +-
.../httpclient/ContextHandlingHttpClient.java | 2 +-
.../httpclient/FileCachingHttpClientBuilder.java | 2 +-
.../httpclient/HttpClientBuilder.java | 2 +-
.../httpclient/HttpClientContextHandler.java | 2 +-
.../httpclient/HttpClientSupport.java | 2 +-
.../httpclient/IdleConnectionSweeper.java | 2 +-
.../InMemoryCachingHttpClientBuilder.java | 2 +-
.../httpclient/RequestConnectionClose.java | 2 +-
.../httpclient/TLSSocketFactory.java | 2 +-
.../httpclient/TLSSocketFactoryBuilder.java | 2 +-
.../httpclient/package-info.java | 2 +-
.../java/support/httpclient/HttpClientSupport.java | 174 +++++----------------
.../java/support/httpclient/package-info.java | 2 +-
.../httpclient/ContextHandlingHttpClientTest.java | 7 +-
.../FileCachingHttpClientBuilderTest.java | 2 +-
.../httpclient/HttpClientBuilderTest.java | 2 +-
.../httpclient/HttpClientSupportTest.java | 2 +-
.../httpclient/IdleConectionSweeperTest.java | 2 +-
.../InMemoryCachingHttpClientBuilderTest.java | 2 +-
.../support => shared}/net/CookieManagerTest.java | 3 +-
.../net/HttpServletSupportTest.java | 3 +-
.../java/support => shared}/net/IPRangeTest.java | 4 +-
.../net/MediaTypeSupportTest.java | 4 +-
.../net/RequestResponseContextFilterTest.java | 3 +-
.../net/SameSiteCookieHeaderFilterTest.java | 3 +-
.../net/SimpleURLCanonicalizerTest.java | 4 +-
.../support => shared}/net/URISupportTest.java | 3 +-
.../support => shared}/net/URLBuilderTest.java | 3 +-
.../HttpServletRequestResponseContextTest.java | 3 +-
.../ThreadLocalHttpServletRequestProxyTest.java | 4 +-
.../ThreadLocalHttpServletResponseProxyTest.java | 4 +-
40 files changed, 85 insertions(+), 197 deletions(-)
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
index 13688122..a1fa40ae 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/FileCachingHttpClientFactoryBean.java
@@ -23,9 +23,9 @@ import org.apache.http.client.HttpClient;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.FactoryBean;
+import net.shibboleth.shared.httpclient.FileCachingHttpClientBuilder;
import net.shibboleth.utilities.java.support.component.DestructableComponent;
import net.shibboleth.utilities.java.support.component.InitializableComponent;
-import net.shibboleth.utilities.java.support.httpclient.FileCachingHttpClientBuilder;
/**
* Factory bean version of {@link FileCachingHttpClientBuilder}.
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java
index e0151668..aab7794f 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/HttpClientFactoryBean.java
@@ -19,11 +19,11 @@ package net.shibboleth.shared.spring.httpclient.factory;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-
import org.apache.http.client.HttpClient;
import org.springframework.beans.factory.FactoryBean;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
+
/**
* Factory bean version of {@link HttpClientBuilder}.
*/
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java
index dc7738d8..357395e0 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/factory/InMemoryCachingHttpClientFactoryBean.java
@@ -22,7 +22,7 @@ import javax.annotation.Nullable;
import org.apache.http.client.HttpClient;
import org.springframework.beans.factory.FactoryBean;
-import net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder;
+import net.shibboleth.shared.httpclient.InMemoryCachingHttpClientBuilder;
/**
* Factory bean version of {@link InMemoryCachingHttpClientBuilder}.
diff --git a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
index 00511ac8..55f58420 100644
--- a/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
+++ b/shib-networking-spring/src/main/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResource.java
@@ -47,11 +47,11 @@ import org.springframework.beans.factory.BeanNameAware;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.core.io.Resource;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
import net.shibboleth.utilities.java.support.annotation.ParameterName;
import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
import net.shibboleth.utilities.java.support.component.AbstractIdentifiedInitializableComponent;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
import net.shibboleth.utilities.java.support.logic.Constraint;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
index 463beb87..a95eed65 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/ConditionalResourceTest.java
@@ -19,12 +19,12 @@ package net.shibboleth.shared.spring.httpclient.resource;
import java.io.IOException;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
import net.shibboleth.shared.spring.resource.ConditionalResource;
import net.shibboleth.shared.spring.resource.ConditionalResourceResolver;
import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpUriRequest;
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
index 50431bcb..27c8a956 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPResourceTest.java
@@ -20,9 +20,9 @@ package net.shibboleth.shared.spring.httpclient.resource;
import java.io.File;
import java.io.IOException;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
import net.shibboleth.shared.spring.context.FilesystemGenericApplicationContext;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
import org.apache.http.client.HttpClient;
import org.springframework.context.support.GenericApplicationContext;
diff --git a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
index 6e58915f..60dd6cb5 100644
--- a/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
+++ b/shib-networking-spring/src/test/java/net/shibboleth/shared/spring/httpclient/resource/HTTPResourceTest.java
@@ -36,10 +36,10 @@ import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+import net.shibboleth.shared.httpclient.HttpClientBuilder;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
+import net.shibboleth.shared.httpclient.InMemoryCachingHttpClientBuilder;
import net.shibboleth.shared.spring.custom.SchemaTypeAwareXMLBeanDefinitionReader;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
-import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
-import net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder;
/**
* Test for HTTPResource.
diff --git a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPBean.xml b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPBean.xml
index ddb75918..bed13c1b 100644
--- a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPBean.xml
+++ b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/FileBackedHTTPBean.xml
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
<bean id="clientBuilder"
- class="net.shibboleth.utilities.java.support.httpclient.FileCachingHttpClientBuilder"
+ class="net.shibboleth.shared.httpclient.FileCachingHttpClientBuilder"
p:maxCacheEntries="3" p:cacheDirectory-ref="theDir" />
<bean id="apacheClient" factory-bean="clientBuilder" init-method="initialize" destroy-method="destroy"
diff --git a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/MemBackedHTTPBean.xml b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/MemBackedHTTPBean.xml
index 238fb3a4..5298a11f 100644
--- a/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/MemBackedHTTPBean.xml
+++ b/shib-networking-spring/src/test/resources/net/shibboleth/shared/spring/httpclient/resource/MemBackedHTTPBean.xml
@@ -3,7 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:c="http://www.springframework.org/schema/c"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
- <bean id="clientBuilder" class="net.shibboleth.utilities.java.support.httpclient.InMemoryCachingHttpClientBuilder"
+ <bean id="clientBuilder" class="net.shibboleth.shared.httpclient.InMemoryCachingHttpClientBuilder"
p:maxCacheEntries="3" />
<bean id="apacheClient"
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
index b5d3c3c7..ac8b87ac 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClient.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClient.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
import java.util.List;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
index 819e0338..61597603 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.File;
import java.io.IOException;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
index 5d846f44..34498e3c 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.net.InetAddress;
import java.net.UnknownHostException;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientContextHandler.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientContextHandler.java
similarity index 97%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientContextHandler.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientContextHandler.java
index fb857207..275917c0 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientContextHandler.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientContextHandler.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
similarity index 99%
copy from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
copy to shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
index 80df09ef..53e6f660 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/HttpClientSupport.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
import java.io.InputStream;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
similarity index 98%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
index fd620b52..b3d0ec8e 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/IdleConnectionSweeper.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/IdleConnectionSweeper.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.time.Duration;
import java.time.Instant;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
similarity index 98%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
index edb368cc..210e72cc 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import javax.annotation.Nonnull;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/RequestConnectionClose.java
similarity index 97%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/RequestConnectionClose.java
index b5fd373a..28885a93 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/RequestConnectionClose.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/RequestConnectionClose.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
index 58d30eaa..b914574e 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactory.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactory.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
import java.net.InetSocketAddress;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java
similarity index 99%
rename from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
rename to shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java
index c5340a39..007856c8 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/TLSSocketFactoryBuilder.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/TLSSocketFactoryBuilder.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/package-info.java
similarity index 94%
copy from shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
copy to shib-networking/src/main/java/net/shibboleth/shared/httpclient/package-info.java
index 06cb8eeb..6591f393 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/shared/httpclient/package-info.java
@@ -17,4 +17,4 @@
/** Classes for working with Apache HttpClient. */
-package net.shibboleth.utilities.java.support.httpclient;
\ No newline at end of file
+package net.shibboleth.shared.httpclient;
\ No newline at end of file
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
index 80df09ef..360e5e13 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupport.java
@@ -18,53 +18,46 @@
package net.shibboleth.utilities.java.support.httpclient;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
import java.nio.charset.UnsupportedCharsetException;
-import java.security.cert.CertificateException;
-import java.security.cert.X509Certificate;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import org.apache.http.HttpEntity;
import org.apache.http.ParseException;
+import org.apache.http.client.HttpClient;
import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
-import org.apache.http.conn.ssl.DefaultHostnameVerifier;
-import org.apache.http.conn.ssl.NoopHostnameVerifier;
-import org.apache.http.entity.ContentType;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.util.CharArrayBuffer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
-import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.shared.httpclient.HttpClientContextHandler;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
+import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
- * Support class for using {@link org.apache.http.client.HttpClient} and related components.
+ * Old support class for using {@link HttpClient} and related components.
+ *
+ * <p>Replaced by {@link net.shibboleth.shared.httpclient.HttpClientSupport}.<.p>
+ *
+ * @deprecated
*/
+ at Deprecated(since="9.0.0", forRemoval=true)
public final class HttpClientSupport {
-
- /** Context key for instances of dynamic context handlers to be invoked before and after the HTTP request.
- * Must be an instance of
- * {@link java.util.List}<code><</code>{@link HttpClientContextHandler}<code>></code>. */
- @Nonnull @NotEmpty
- public static final String CONTEXT_KEY_DYNAMIC_CONTEXT_HANDLERS = "java-support.DynamicContextHandlers";
/** Constructor to prevent instantiation. */
private HttpClientSupport() { }
+ /**
+ * Log deprecation warning.
+ */
+ private static void deprecation() {
+ DeprecationSupport.warn(ObjectType.CLASS, HttpClientSupport.class.getName(), null,
+ net.shibboleth.shared.httpclient.HttpClientSupport.class.getName());
+ }
+
/**
* Build an instance of TLS-capable {@link LayeredConnectionSocketFactory} which uses
* the standard JSSE default {@link SSLContext} and which performs
@@ -73,9 +66,8 @@ public final class HttpClientSupport {
* @return a new instance of HttpClient SSL connection socket factory
*/
@Nonnull public static LayeredConnectionSocketFactory buildStrictTLSSocketFactory() {
- return new TLSSocketFactoryBuilder()
- .setHostnameVerifier(new DefaultHostnameVerifier())
- .build();
+ deprecation();
+ return net.shibboleth.shared.httpclient.HttpClientSupport.buildStrictTLSSocketFactory();
}
/**
@@ -85,10 +77,8 @@ public final class HttpClientSupport {
* @return a new instance of HttpClient SSL connection socket factory
*/
@Nonnull public static LayeredConnectionSocketFactory buildNoTrustTLSSocketFactory() {
- return new TLSSocketFactoryBuilder()
- .setTrustManagers(Collections.<TrustManager>singletonList(buildNoTrustX509TrustManager()))
- .setHostnameVerifier(new NoopHostnameVerifier())
- .build();
+ deprecation();
+ return net.shibboleth.shared.httpclient.HttpClientSupport.buildNoTrustTLSSocketFactory();
}
/**
@@ -97,39 +87,8 @@ public final class HttpClientSupport {
* @return a new trust manager instance
*/
@Nonnull public static X509TrustManager buildNoTrustX509TrustManager() {
- // Checkstyle: AnonInnerLength OFF
- return new X509TrustManager() {
- private Logger log = LoggerFactory.getLogger(HttpClientSupport.class.getName()
- + ".NoTrustX509TrustManager");
-
- public X509Certificate[] getAcceptedIssuers() {
- log.trace("In getAcceptedIssuers");
- return null;
- }
-
- public void checkServerTrusted(final X509Certificate[] chain, final String authType)
- throws CertificateException {
- log.trace("In checkServerTrusted");
- if (chain != null) {
- log.trace("Cert chain length: {}", chain.length);
- for (final X509Certificate cert : chain) {
- log.trace("Cert key type: {}, subject: {}",
- cert.getPublicKey().getAlgorithm(), cert.getSubjectX500Principal().getName());
- }
- } else {
- log.trace("Cert chain was null");
- }
- // accept everything
- }
-
- public void checkClientTrusted(final X509Certificate[] chain, final String authType)
- throws CertificateException {
- log.trace("In checkClientTrusted");
- // accept everything
- }
- };
- // Checkstyle: AnonInnerLength ON
-
+ deprecation();
+ return net.shibboleth.shared.httpclient.HttpClientSupport.buildNoTrustX509TrustManager();
}
/**
@@ -140,14 +99,8 @@ public final class HttpClientSupport {
*/
@Nonnull public static List<HttpClientContextHandler> getDynamicContextHandlerList(
@Nonnull final HttpClientContext context) {
- Constraint.isNotNull(context, "HttpClientContext was null");
- List<HttpClientContextHandler> handlers =
- context.getAttribute(CONTEXT_KEY_DYNAMIC_CONTEXT_HANDLERS, List.class);
- if (handlers == null) {
- handlers = new ArrayList<>();
- context.setAttribute(CONTEXT_KEY_DYNAMIC_CONTEXT_HANDLERS, handlers);
- }
- return handlers;
+ deprecation();
+ return net.shibboleth.shared.httpclient.HttpClientSupport.getDynamicContextHandlerList(context);
}
/**
@@ -159,7 +112,8 @@ public final class HttpClientSupport {
*/
public static void addDynamicContextHandlerFirst(@Nonnull final HttpClientContext context,
@Nonnull final HttpClientContextHandler handler) {
- addDynamicContextHandlerFirst(context, handler, false);
+ deprecation();
+ net.shibboleth.shared.httpclient.HttpClientSupport.addDynamicContextHandlerFirst(context, handler);
}
/**
@@ -172,13 +126,8 @@ public final class HttpClientSupport {
*/
public static void addDynamicContextHandlerFirst(@Nonnull final HttpClientContext context,
@Nonnull final HttpClientContextHandler handler, final boolean uniqueType) {
- Constraint.isNotNull(handler, "HttpClientContextHandler was null");
- final List<HttpClientContextHandler> list = getDynamicContextHandlerList(context);
- if (list.contains(handler)
- || (uniqueType && list.stream().anyMatch(h -> handler.getClass().equals(h.getClass())))) {
- return;
- }
- list.add(0, handler);
+ deprecation();
+ net.shibboleth.shared.httpclient.HttpClientSupport.addDynamicContextHandlerFirst(context, handler, uniqueType);
}
/**
@@ -190,7 +139,8 @@ public final class HttpClientSupport {
*/
public static void addDynamicContextHandlerLast(@Nonnull final HttpClientContext context,
@Nonnull final HttpClientContextHandler handler) {
- addDynamicContextHandlerLast(context, handler, false);
+ deprecation();
+ net.shibboleth.shared.httpclient.HttpClientSupport.addDynamicContextHandlerLast(context, handler);
}
/**
@@ -203,16 +153,10 @@ public final class HttpClientSupport {
*/
public static void addDynamicContextHandlerLast(@Nonnull final HttpClientContext context,
@Nonnull final HttpClientContextHandler handler, final boolean uniqueType) {
- Constraint.isNotNull(handler, "HttpClientContextHandler was null");
- final List<HttpClientContextHandler> list = getDynamicContextHandlerList(context);
- if (list.contains(handler)
- || (uniqueType && list.stream().anyMatch(h -> handler.getClass().equals(h.getClass())))) {
- return;
- }
- list.add(handler);
+ deprecation();
+ net.shibboleth.shared.httpclient.HttpClientSupport.addDynamicContextHandlerLast(context, handler, uniqueType);
}
-// Checkstyle: CyclomaticComplexity OFF
/**
* Get the entity content as a String, using the provided default character set
* if none is found in the entity.
@@ -231,49 +175,9 @@ public final class HttpClientSupport {
*/
@Nullable public static String toString(@Nonnull final HttpEntity entity, @Nullable final Charset defaultCharset,
final int maxLength) throws IOException, ParseException {
- try (final InputStream instream = entity.getContent()) {
- if (instream == null) {
- return null;
- }
- if (entity.getContentLength() > maxLength || entity.getContentLength() > Integer.MAX_VALUE) {
- throw new IOException("HTTP entity size exceeded limit");
- }
- int i = (int) entity.getContentLength();
- if (i < 0) {
- i = 4096;
- }
- Charset charset = null;
- try {
- final ContentType contentType = ContentType.get(entity);
- if (contentType != null) {
- charset = contentType.getCharset();
- }
- } catch (final UnsupportedCharsetException ex) {
- throw new UnsupportedEncodingException(ex.getMessage());
- }
- if (charset == null) {
- charset = defaultCharset;
- }
- if (charset == null) {
- charset = HTTP.DEF_CONTENT_CHARSET;
- }
- try (final Reader reader = new InputStreamReader(instream, charset)) {
- final CharArrayBuffer buffer = new CharArrayBuffer(i);
- final char[] tmp = new char[1024];
- int size = 0;
- int l;
- while((l = reader.read(tmp)) != -1) {
- size += l;
- if (size > maxLength) {
- throw new IOException("HTTP entity size exceeded limit");
- }
- buffer.append(tmp, 0, l);
- }
- return buffer.toString();
- }
- }
+ deprecation();
+ return net.shibboleth.shared.httpclient.HttpClientSupport.toString(entity, defaultCharset, maxLength);
}
-// Checkstyle: CyclomaticComplexity ON
/**
* Get the entity content as a String, using the provided default character set
@@ -292,7 +196,8 @@ public final class HttpClientSupport {
*/
@Nullable public static String toString(@Nonnull final HttpEntity entity, @Nullable final String defaultCharset,
final int maxLength) throws IOException, ParseException {
- return toString(entity, defaultCharset != null ? Charset.forName(defaultCharset) : null, maxLength);
+ deprecation();
+ return net.shibboleth.shared.httpclient.HttpClientSupport.toString(entity, defaultCharset, maxLength);
}
/**
@@ -311,7 +216,8 @@ public final class HttpClientSupport {
*/
@Nullable public static String toString(@Nonnull final HttpEntity entity, final int maxLength)
throws IOException, ParseException {
- return toString(entity, (Charset) null, maxLength);
+ deprecation();
+ return net.shibboleth.shared.httpclient.HttpClientSupport.toString(entity, maxLength);
}
}
\ No newline at end of file
diff --git a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
index 06cb8eeb..da7ce357 100644
--- a/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
+++ b/shib-networking/src/main/java/net/shibboleth/utilities/java/support/httpclient/package-info.java
@@ -15,6 +15,6 @@
* limitations under the License.
*/
-/** Classes for working with Apache HttpClient. */
+/** Legacy Classes for working with Apache HttpClient. */
package net.shibboleth.utilities.java.support.httpclient;
\ No newline at end of file
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClientTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClientTest.java
similarity index 99%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClientTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClientTest.java
index 36cebbbc..2348cd3a 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/ContextHandlingHttpClientTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/ContextHandlingHttpClientTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
import java.util.ArrayList;
@@ -1814,11 +1814,6 @@ public class ContextHandlingHttpClientTest {
name = instanceName;
}
- public TestContextHandler(Throwable beforeError, Throwable afterError) {
- invokeBeforeError = beforeError;
- invokeAfterError = afterError;
- }
-
public TestContextHandler(String instanceName, Throwable beforeError, Throwable afterError) {
name = instanceName;
invokeBeforeError = beforeError;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilderTest.java
similarity index 95%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilderTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilderTest.java
index fbe241e3..b107ecdd 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/FileCachingHttpClientBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/FileCachingHttpClientBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import org.apache.http.client.HttpClient;
import org.testng.annotations.Test;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
similarity index 98%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
index a3a948db..8f8fa65c 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientBuilderTest.java
@@ -16,7 +16,7 @@
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
import java.time.Duration;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientSupportTest.java
similarity index 99%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupportTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientSupportTest.java
index 7b018d0f..524e6abe 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/HttpClientSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/HttpClientSupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.io.IOException;
import java.util.Collections;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/IdleConectionSweeperTest.java
similarity index 98%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/httpclient/IdleConectionSweeperTest.java
index 59d0b646..596bb86d 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/IdleConectionSweeperTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/IdleConectionSweeperTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import java.time.Duration;
import java.util.Timer;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilderTest.java b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilderTest.java
similarity index 95%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilderTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilderTest.java
index c90ce9b7..ab4de830 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/httpclient/InMemoryCachingHttpClientBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/httpclient/InMemoryCachingHttpClientBuilderTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.httpclient;
+package net.shibboleth.shared.httpclient;
import org.apache.http.client.HttpClient;
import org.testng.annotations.Test;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
similarity index 98%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
index a362d2e3..a07a16b8 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/CookieManagerTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/CookieManagerTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.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/HttpServletSupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/HttpServletSupportTest.java
similarity index 98%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/HttpServletSupportTest.java
index 962bd14d..32acba74 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/HttpServletSupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.util.Collections;
import java.util.List;
@@ -29,7 +29,6 @@ import org.testng.annotations.Test;
import com.google.common.net.MediaType;
-import net.shibboleth.shared.net.HttpServletSupport;
/** {@link HttpServletSupport} unit test. */
@SuppressWarnings("javadoc")
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/IPRangeTest.java
similarity index 98%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/IPRangeTest.java
index 083cb2ae..f59e53c8 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/IPRangeTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/IPRangeTest.java
@@ -16,15 +16,13 @@
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
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/shared/net/MediaTypeSupportTest.java
similarity index 97%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/MediaTypeSupportTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/MediaTypeSupportTest.java
index f990e992..df3da5cc 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/MediaTypeSupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/MediaTypeSupportTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.util.Set;
@@ -24,8 +24,6 @@ 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/shared/net/RequestResponseContextFilterTest.java
similarity index 97%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/RequestResponseContextFilterTest.java
index 24fdb813..4bdae85d 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/RequestResponseContextFilterTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/RequestResponseContextFilterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.io.IOException;
@@ -38,6 +38,7 @@ import jakarta.servlet.ServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import net.shibboleth.shared.net.impl.HttpServletRequestResponseContext;
+import net.shibboleth.utilities.java.support.net.RequestResponseContextFilter;
/**
* 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/shared/net/SameSiteCookieHeaderFilterTest.java
similarity index 99%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/SameSiteCookieHeaderFilterTest.java
index 97996d80..6de59750 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SameSiteCookieHeaderFilterTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/SameSiteCookieHeaderFilterTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.io.IOException;
import java.io.OutputStreamWriter;
@@ -50,6 +50,7 @@ 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;
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/shared/net/SimpleURLCanonicalizerTest.java
similarity index 95%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/SimpleURLCanonicalizerTest.java
index 149ad0de..e819a7c0 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/SimpleURLCanonicalizerTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/SimpleURLCanonicalizerTest.java
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
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/URISupportTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
similarity index 98%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
index e6272a83..5ad76e53 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URISupportTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/URISupportTest.java
@@ -15,14 +15,13 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.util.ArrayList;
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/shared/net/URLBuilderTest.java
similarity index 98%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
index 3048c1c5..5273a3c2 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/URLBuilderTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/URLBuilderTest.java
@@ -15,11 +15,10 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net;
import java.net.MalformedURLException;
-import net.shibboleth.shared.net.URLBuilder;
import net.shibboleth.utilities.java.support.collection.Pair;
import org.testng.annotations.Test;
diff --git a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContextTest.java
similarity index 96%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContextTest.java
index 803bd24f..208836b4 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/HttpServletRequestResponseContextTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/HttpServletRequestResponseContextTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
@@ -26,7 +26,6 @@ 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/ThreadLocalHttpServletRequestProxyTest.java b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxyTest.java
similarity index 94%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxyTest.java
index fb94b6ea..a67a35ec 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletRequestProxyTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletRequestProxyTest.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
-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/shared/net/impl/ThreadLocalHttpServletResponseProxyTest.java
similarity index 94%
rename from shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
rename to shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxyTest.java
index a7838cae..4b7ccec4 100644
--- a/shib-networking/src/test/java/net/shibboleth/utilities/java/support/net/ThreadLocalHttpServletResponseProxyTest.java
+++ b/shib-networking/src/test/java/net/shibboleth/shared/net/impl/ThreadLocalHttpServletResponseProxyTest.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-package net.shibboleth.utilities.java.support.net;
+package net.shibboleth.shared.net.impl;
-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;
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list