Merge branch 'main' into release

Author: alicela

.github/workflows/maven.yml

@@ -34,7 +34,7 @@ jobs:
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
     - name: Update dependency graph
-      uses: advanced-security/maven-dependency-submission-action@49866fead7de0b0083b89f5f653f9620548ccddf
+      uses: advanced-security/maven-dependency-submission-action@4b6fc92adc1df4c41b470e692a1688a448907248
 
     - name: Coveralls GitHub Action
       uses: coverallsapp/github-action@v2.3.6

pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.3</version>
+    <version>3.4.5</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
@@ -44,7 +44,7 @@
     <maven.compiler.release>21</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <jackson.version>2.18.2</jackson.version>
+    <jackson.version>2.19.0</jackson.version>
     <jacoco.version>0.8.12</jacoco.version>
   </properties>
 
@@ -105,7 +105,7 @@
     <dependency>
       <groupId>net.sf.saxon</groupId>
       <artifactId>Saxon-HE</artifactId>
-      <version>12.5</version>
+      <version>12.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

src/main/java/fr/insee/bpm/metadata/reader/ddi/DDIReader.java

@@ -23,7 +23,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
-import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -49,24 +48,23 @@ private DDIReader() {
 	 * @param ddiUrlString : Path to the DDI file.
 	 *
 	 * @return The variables found in the DDI.
-	 * @throws MetadataParserException
+	 * @throws MetadataParserException when metadata can't be read
 	 */
 	public static MetadataModel getMetadataFromDDI(String ddiUrlString, InputStream ddiInputStream) throws MetadataParserException {
 
 		try {
 			// Path of the output 'variables.xml' temp file
-			File variablesFile = File.createTempFile("variables", ".xml");
-			variablesFile.deleteOnExit();
-			Path variablesTempFilePath = variablesFile.toPath();
+			Path variablesFile = Files.createTempFile("variables", ".xml");
+			variablesFile.toFile().deleteOnExit();
 
-			transformDDI(ddiUrlString, ddiInputStream, variablesTempFilePath);
-			MetadataModel metadataModel = readVariables(variablesTempFilePath);
-			Files.delete(variablesFile.toPath());
+			transformDDI(ddiUrlString, ddiInputStream, variablesFile);
+			MetadataModel metadataModel = readVariables(variablesFile);
+			Files.delete(variablesFile);
 			return metadataModel;
 		}
 
 		catch (MalformedURLException e) {
-			log.error(String.format("Error when converting file path '%s' to an URL.", ddiUrlString), e);
+			log.error("Error when converting file path '{}' to an URL.", ddiUrlString, e);
 			return null;
 		} catch (IOException e) {
 			log.error("Unable to write temp file.", e);
@@ -94,7 +92,7 @@ private static void transformDDI(String ddiUrlString, InputStream ddiInputStream
 	 *
 	 * @param variablesFilePath Path to the transformed xml file.
 	 * @return The variables described in the file.
-	 * @throws MetadataParserException
+	 * @throws MetadataParserException  when metadata can't be read
 	 * @throws IOException
 	 * @throws SAXException
 	 * @throws ParserConfigurationException
@@ -144,8 +142,7 @@ private static MetadataModel readVariables(Path variablesFilePath)
 
 				}
 			} catch (NullPointerException e) {
-				log.error(String.format("Missing field in mandatory information for variable %s",
-						((Element) groupElements.item(i)).getAttribute("name")));
+				log.error("Missing field in mandatory information for variable {}", ((Element) groupElements.item(i)).getAttribute("name"));
 			}
 
 			String finalRootGroupName = rootGroupName;