[spring-extensions] branch master updated: JSE-34 Initialize return from createRelative

[Rod Widdowson]

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

rdw pushed a commit to branch master
in repository spring-extensions.

View the commit online:
http://git.shibboleth.net/view/?p=spring-extensions.git;a=commit;h=b9ac1937bba8ebc3a8a7fb96f29063400cc228ef

The following commit(s) were added to refs/heads/master by this push:
       new  b9ac193   JSE-34 Initialize return from createRelative
b9ac193 is described below

commit b9ac1937bba8ebc3a8a7fb96f29063400cc228ef
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri May 8 16:02:02 2020 +0100

    JSE-34 Initialize return from createRelative
    
    https://issues.shibboleth.net/jira/browse/JSE-34
---
 .../java/net/shibboleth/ext/spring/resource/HTTPResource.java  | 10 +++++++++-
 .../net/shibboleth/ext/spring/resource/HTTPResourceTest.java   |  4 ----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java b/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
index 5667b40..b16bcab 100644
--- a/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
+++ b/src/main/java/net/shibboleth/ext/spring/resource/HTTPResource.java
@@ -31,6 +31,7 @@ import javax.annotation.Nullable;
 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.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;
 import net.shibboleth.utilities.java.support.logic.Constraint;
@@ -343,7 +344,14 @@ public class HTTPResource extends AbstractIdentifiedInitializableComponent imple
         } else {
             path = relativePath;
         }
-        return new HTTPResource(httpClient, new URL(resourceURL, path));
+        final HTTPResource result = new HTTPResource(httpClient, new URL(resourceURL, path));
+        try {
+            result.setId(getId()+"_"+relativePath);
+            result.initialize();
+        } catch (final ComponentInitializationException e) {
+            throw new IOException(e);
+        }
+        return result;
     }
 
     /** {@inheritDoc} */
diff --git a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
index b0ee904..57e024b 100644
--- a/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
+++ b/src/test/java/net/shibboleth/ext/spring/resource/HTTPResourceTest.java
@@ -21,11 +21,8 @@ import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
-import java.nio.file.attribute.PosixFilePermissions;
 import java.time.Instant;
 import java.util.Collection;
-import java.util.Set;
 
 import org.apache.http.client.HttpClient;
 import org.apache.http.client.cache.CacheResponseStatus;
@@ -39,7 +36,6 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-
 import net.shibboleth.ext.spring.util.SchemaTypeAwareXMLBeanDefinitionReader;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientBuilder;
 import net.shibboleth.utilities.java.support.httpclient.HttpClientContextHandler;

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