maj passage JAVA 11

Dockerfile

-FROM openjdk:11-jdk-slim
+FROM eclipse-temurin:11-jdk-alpine
 RUN apk --no-cache add curl
 RUN apk --no-cache add --update ttf-dejavu
 EXPOSE 8080

src/main/java/fr/gouv/siig/descartes/services/descartes/services/ExportMapService.java

@@ -26,10 +26,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
 
-//import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-//import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-//import com.sun.org.apache.xpath.internal.XPathAPI;
-
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
 import org.apache.xpath.XPathAPI;
@@ -121,7 +117,7 @@ public abstract class ExportMapService {
         progression(mapWriter,response);
     }
 
-    @SuppressWarnings("null")
+    //@SuppressWarnings("null")
 	/**
 	 * Methode: doPost(HttpServletRequest, HttpServletResponse)
      * Traite la requête en fonction de la présence ou non du paramètre "paramsExport".
@@ -310,7 +306,7 @@ public abstract class ExportMapService {
 		return params;
 	}
 	
-	@SuppressWarnings("null")
+	//@SuppressWarnings("null")
 	private void progression(AbstractMapWriter mapWriter, HttpServletResponse response) throws IOException {
         response.setContentType("text/html");
         if (mapWriter == null) {

src/main/java/fr/gouv/siig/descartes/services/descartes/services/HostMapping.java

@@ -14,10 +14,6 @@ import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
-//import com.sun.org.apache.xml.internal.serialize.OutputFormat;
-//import com.sun.org.apache.xml.internal.serialize.XMLSerializer;
-//import com.sun.org.apache.xpath.internal.XPathAPI;
-
 import org.apache.xml.serialize.OutputFormat;
 import org.apache.xml.serialize.XMLSerializer;
 import org.apache.xpath.XPathAPI;

src/main/java/fr/gouv/siig/descartes/services/descartes/services/OwsHelperService.java

 package fr.gouv.siig.descartes.services.descartes.services;
 
-//import com.sun.org.apache.xpath.internal.XPathAPI;
 import org.apache.xpath.XPathAPI;
 
 import fr.gouv.siig.descartes.services.descartes.tools.HttpProxy;
@@ -253,7 +252,7 @@ public class OwsHelperService {
 				layerRequestNodes = XPathAPI.selectNodeList(requestList.item(i),"Request");
 				layerVersionNodes = XPathAPI.selectNodeList(requestList.item(i),"Version");
 				layerFeatureGeometryNameNodes = XPathAPI.selectNodeList(requestList.item(i),"FeatureGeometryName");
-				String fluxInfos = "";
+				//String fluxInfos = "";
 				
 				OwsResultAsynRequest owsResultAsynRequest = new OwsResultAsynRequest();
 				owsResultAsynRequest.setLayerMinScale(layerMinScale);
@@ -334,7 +333,7 @@ public class OwsHelperService {
 				for (int i=0, len=layersInfosXML.size() ; i<len ; i++) {
 					String htmlTable = "";
 					if (this.xsl2HtmlFile == null) {
-						htmlTable += XmlTools.executeInternalXSL(layersInfosXML.get(i), new ClassPathResource(this.internalXsl2HtmlFile).getInputStream(), this.getXsltParams(layersMinScales.get(i), layersMaxScales.get(i), body.get("withReturn"), layersId.get(i), layersMsgError.get(i)));
+						htmlTable += XmlTools.executeInternalXSL(layersInfosXML.get(i), new ClassPathResource(this.internalXsl2HtmlFile, this.getClass().getClassLoader()).getInputStream(), this.getXsltParams(layersMinScales.get(i), layersMaxScales.get(i), body.get("withReturn"), layersId.get(i), layersMsgError.get(i)));
 					} else {
 						htmlTable += XmlTools.executeXSL(layersInfosXML.get(i), this.xsl2HtmlFile, this.getXsltParams(layersMinScales.get(i), layersMaxScales.get(i), body.get("withReturn"), layersId.get(i), layersMsgError.get(i)));
 					}
@@ -354,7 +353,7 @@ public class OwsHelperService {
 			} else if (this.outputFormat.equals("text/plain")) {
 				outputString = "[";
 				for (int i=0, len=layersInfosXML.size() ; i<len ; i++) {
-					String json = XmlTools.executeInternalXSL(layersInfosXML.get(i), new ClassPathResource(this.internalXsl2JsonFile).getInputStream(),  this.getXsltParams(layersMinScales.get(i), layersMaxScales.get(i), body.get("withReturn"), layersId.get(i), layersMsgError.get(i)));
+					String json = XmlTools.executeInternalXSL(layersInfosXML.get(i), new ClassPathResource(this.internalXsl2JsonFile, this.getClass().getClassLoader()).getInputStream(),  this.getXsltParams(layersMinScales.get(i), layersMaxScales.get(i), body.get("withReturn"), layersId.get(i), layersMsgError.get(i)));
 					if (!outputString.equals("[")) {
 						outputString += ",";
 					}
@@ -408,7 +407,7 @@ public class OwsHelperService {
     			for (String layerRequest : layerRequests) {
     				LOGGER.debug("***** OwsHelperService url: " + layerRequest);
     				getFeatureXxxResultXML = HttpSender.getGetResponse(layerRequest,httpProxy,this.httpConnectionTimeout,this.httpSocketTimeout,this.requestHeaders);
-    				fluxInfos += XmlTools.executeInternalXSL(getFeatureXxxResultXML, new ClassPathResource(this.internalXslFile).getInputStream(), null);
+    				fluxInfos += XmlTools.executeInternalXSL(getFeatureXxxResultXML, new ClassPathResource(this.internalXslFile, this.getClass().getClassLoader()).getInputStream(), null);
     				
     			}	
 			} catch (HttpSenderException e) {
@@ -452,7 +451,7 @@ public class OwsHelperService {
 		StringBuffer stylesCssBuf = new StringBuffer();
 		LineNumberReader stylesCssReader;
 		if (this.stylesCssFileName == null) {
-			stylesCssReader = new LineNumberReader(new InputStreamReader(new ClassPathResource(INTERNAL_STYLE_CSS).getInputStream()));
+			stylesCssReader = new LineNumberReader(new InputStreamReader(new ClassPathResource(INTERNAL_STYLE_CSS, this.getClass().getClassLoader()).getInputStream()));
 		} else {
 			stylesCssReader = new LineNumberReader(new FileReader(this.stylesCssFileName));
 		}

src/main/java/fr/gouv/siig/descartes/services/descartes/tools/imagery/GetImageHelper.java

@@ -64,7 +64,7 @@ public class GetImageHelper {
         ServletOutputStream out = response.getOutputStream();
         try {
             byte [] tmpByte = new byte[200];
-            InputStream in = new ClassPathResource(image).getInputStream();         
+            InputStream in = new ClassPathResource(image, this.getClass().getClassLoader()).getInputStream();         
             @SuppressWarnings("unused")
 			int tm;
             while ((tm=in.read(tmpByte))!=-1)