Fix follow redirect for distant decor retrieving

hl7templates/hl7templates-generator-jar/src/main/java/net/ihe/gazelle/tempgen/action/AttributeAnalyzer.java

@@ -232,7 +232,7 @@ public class AttributeAnalyzer extends AttributeProcessorImpl {
 
 	@Override
 	public void processIsOptional(Boolean isOptional) {
-		if ((isOptional == null || !isOptional.booleanValue()) && (selectedAttribute.isProhibited() != null && !selectedAttribute.isProhibited().booleanValue())){
+		if ((isOptional == null || !isOptional.booleanValue()) ){
 			List<String> listAttrNames = AttributeUtil.getListAttributesNames(selectedAttribute);
 			for (String attrName : listAttrNames) {
 				if (AttributeUtil.assertAttributeIsNotRequiredByDefault(this.selectedAttribute, attrName)){

hl7templates/hl7templates-model-jar/pom.xml

@@ -229,5 +229,6 @@
             <version>1.4.1</version>
         </dependency>
 
+
     </dependencies>
 </project>

hl7templates/hl7templates-model-jar/src/main/java/net/ihe/gazelle/tempmodel/org/decor/art/utils/DecorMarshaller.java

 package net.ihe.gazelle.tempmodel.org.decor.art.utils;
 
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLConnection;
+import net.ihe.gazelle.tempmodel.org.decor.art.model.Decor;
+import org.apache.commons.validator.routines.UrlValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
-
-import org.apache.commons.validator.routines.UrlValidator;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import net.ihe.gazelle.tempmodel.org.decor.art.model.Decor;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 
 /**
  * 
@@ -27,6 +27,11 @@ public final class DecorMarshaller {
 	
 	
 	private static Logger log = LoggerFactory.getLogger(DecorMarshaller.class);
+
+	private static HttpClient httpClient = HttpClient.newBuilder()
+			.connectTimeout(java.time.Duration.ofSeconds(10))
+			.followRedirects(HttpClient.Redirect.ALWAYS)
+			.build();
 	
 	private DecorMarshaller() {}
 
@@ -65,19 +70,13 @@ public final class DecorMarshaller {
 		InputStream is = null;
 		try {
 			if (UrlValidator.getInstance().isValid(path)) {
-				URL url;
-				
-					url = new URL(path);
-				URLConnection urlConnection = url.openConnection();
-				urlConnection.setConnectTimeout(10000);
-				urlConnection.setReadTimeout(10000);
-				is = urlConnection.getInputStream();
+				is = getInputStreamFromURL(path);
 			}
 			else {
 				is = new FileInputStream(path);
 			}
 			return loadDecor(is);
-		} catch (IOException e) {
+		} catch (IOException | InterruptedException e) {
 			log.error("Error to load decor from url : " + path, e);
 		}finally {
 			if (is != null) {
@@ -106,5 +105,14 @@ public final class DecorMarshaller {
 		mar.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
 		mar.marshal(decor, os);
 	}
-	
+
+	private static InputStream getInputStreamFromURL(String url) throws IOException, InterruptedException {
+		HttpRequest request = HttpRequest.newBuilder()
+				.GET()
+				.uri(java.net.URI.create(url))
+				.build();
+		HttpResponse<InputStream> response = httpClient.send(request, HttpResponse.BodyHandlers.ofInputStream());
+		return response.body();
+	}
+
 }