[java-shib-metadata] branch main updated: Relocated HTTPResource classes and factory beans.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-shib-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=b449b29d888c5adcec20b72a276bfe5d69753007

The following commit(s) were added to refs/heads/main by this push:
     new b449b29d8 Relocated HTTPResource classes and factory beans.
b449b29d8 is described below

commit b449b29d888c5adcec20b72a276bfe5d69753007
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Sep 13 14:34:47 2022 -0400

    Relocated HTTPResource classes and factory beans.
---
 shib-metadata-spring/pom.xml                                        | 5 +++++
 .../shibboleth/spring/http/FileCachingHttpClientFactoryBean.java    | 2 +-
 .../java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java    | 4 ++--
 .../main/java/net/shibboleth/spring/http/HttpClientFactoryBean.java | 2 +-
 .../spring/http/InMemoryCachingHttpClientFactoryBean.java           | 2 +-
 .../net/shibboleth/spring/http/HTTPResourceConfigurationTests.java  | 2 +-
 .../src/test/resources/net/shibboleth/spring/http/HTTPResources.xml | 6 +++---
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/shib-metadata-spring/pom.xml b/shib-metadata-spring/pom.xml
index 7d54cd8ed..5e2dbc4a9 100644
--- a/shib-metadata-spring/pom.xml
+++ b/shib-metadata-spring/pom.xml
@@ -71,6 +71,11 @@
             <artifactId>opensaml-xmlsec-impl</artifactId>
         </dependency>
     
+        <dependency>
+            <groupId>${shib-shared.groupId}</groupId>
+            <artifactId>shib-networking-spring</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/FileCachingHttpClientFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/FileCachingHttpClientFactoryBean.java
index b6bde8839..52981f1f7 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/FileCachingHttpClientFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/FileCachingHttpClientFactoryBean.java
@@ -21,7 +21,7 @@ package net.shibboleth.spring.http;
  * Factory bean customization for the Shibboleth IdP.
  */
 public class FileCachingHttpClientFactoryBean 
-        extends net.shibboleth.ext.spring.factory.FileCachingHttpClientFactoryBean {
+        extends net.shibboleth.shared.spring.httpclient.factory.FileCachingHttpClientFactoryBean {
     
     /**
      * Constructor.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
index 79829a6f8..6c21abd17 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HTTPResourceFactoryBean.java
@@ -53,8 +53,8 @@ import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.core.io.Resource;
 
-import net.shibboleth.ext.spring.resource.FileBackedHTTPResource;
-import net.shibboleth.ext.spring.resource.HTTPResource;
+import net.shibboleth.shared.spring.httpclient.resource.FileBackedHTTPResource;
+import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
 import net.shibboleth.utilities.java.support.annotation.constraint.NotEmpty;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HttpClientFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HttpClientFactoryBean.java
index ae98bfbee..cbe88d97a 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HttpClientFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/HttpClientFactoryBean.java
@@ -20,7 +20,7 @@ package net.shibboleth.spring.http;
 /**
  * Factory bean customization for the Shibboleth IdP.
  */
-public class HttpClientFactoryBean extends net.shibboleth.ext.spring.factory.HttpClientFactoryBean {
+public class HttpClientFactoryBean extends net.shibboleth.shared.spring.httpclient.factory.HttpClientFactoryBean {
 
     /**
      * Constructor.
diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/InMemoryCachingHttpClientFactoryBean.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/InMemoryCachingHttpClientFactoryBean.java
index 5e35b0bc2..365e51f5c 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/InMemoryCachingHttpClientFactoryBean.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/http/InMemoryCachingHttpClientFactoryBean.java
@@ -21,7 +21,7 @@ package net.shibboleth.spring.http;
  *  Factory bean customization for the Shibboleth IdP.
  */
 public class InMemoryCachingHttpClientFactoryBean 
-        extends net.shibboleth.ext.spring.factory.InMemoryCachingHttpClientFactoryBean {
+        extends net.shibboleth.shared.spring.httpclient.factory.InMemoryCachingHttpClientFactoryBean {
     
     /**
      * Constructor.
diff --git a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
index 11a998f80..804b7f257 100644
--- a/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
+++ b/shib-metadata-spring/src/test/java/net/shibboleth/spring/http/HTTPResourceConfigurationTests.java
@@ -31,8 +31,8 @@ import org.testng.annotations.AfterSuite;
 import org.testng.annotations.BeforeSuite;
 import org.testng.annotations.Test;
 
-import net.shibboleth.ext.spring.resource.HTTPResource;
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
+import net.shibboleth.shared.spring.httpclient.resource.HTTPResource;
 import net.shibboleth.shared.testing.RepositorySupport;
 import net.shibboleth.shared.testing.ResourceTestHelper;
 
diff --git a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
index bbc9c1a23..9231eeccc 100644
--- a/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
+++ b/shib-metadata-spring/src/test/resources/net/shibboleth/spring/http/HTTPResources.xml
@@ -15,7 +15,7 @@
 	<bean id="basicClient" factory-bean="clientBuilder" init-method="initialize" destroy-method="destroy"
 		factory-method="buildClient" />
 
-	<bean id="basic" class="net.shibboleth.ext.spring.resource.HTTPResource"
+	<bean id="basic" class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"
 		c:client-ref="basicClient" c:url="%{resourceURL}" />
 
     <bean id="inMemoryClient" 
@@ -23,7 +23,7 @@
         p:maxCacheEntries="3"
         p:connectionTimeout="PT3M" />
         
-    <bean id="inMemory" class="net.shibboleth.ext.spring.resource.HTTPResource"
+    <bean id="inMemory" class="net.shibboleth.shared.spring.httpclient.resource.HTTPResource"
         c:client-ref="inMemoryClient" c:url="%{resourceURL}" />
 
     <bean id="fileClient" 
@@ -31,7 +31,7 @@
         p:maxCacheEntries="3000"
         p:cacheDirectory-ref="theDir"/>
         
-    <bean id="fileResource" class="net.shibboleth.ext.spring.resource.FileBackedHTTPResource"
+    <bean id="fileResource" class="net.shibboleth.shared.spring.httpclient.resource.FileBackedHTTPResource"
         c:client-ref="fileClient" c:url="%{resourceURL}"
         c:backingFile="#{getObject('theDir').getPath()}/fileResource.xml"/>
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.