continuer les modifs

Author: Hajarel-moukh

src/main/java/fr/insee/genesis/controller/rest/UtilsController.java

@@ -47,7 +47,7 @@ public ResponseEntity<Object> saveResponsesFromXmlFile(@RequestParam("inputFolde
 		XMLSplitter.split(inputFolder, filename, outputFolder, "SurveyUnit", nbSU);
 		return ResponseEntity.ok("File split");
 	}
-
+//TODO
 	@Operation(summary = "Record volumetrics of each campaign in a folder")
 	@PutMapping(path = "/volumetrics/save-all-campaigns")
 	@PreAuthorize("hasRole('SCHEDULER')")

src/main/java/fr/insee/genesis/controller/rest/responses/ResponseController.java

@@ -578,8 +578,8 @@ private void processOneXmlFileForCampaign(String campaignName,
             fileUtils.moveDataFile(campaignName, mode.getFolder(),filepath);
             return;
         }
-        log.error("Error {} on file {} : {}", response.getStatusCode(), fileName,  response.getBody());
-
+        log.error("Failed to process file {} for campaign {} mode {} (HTTP: {})",
+                fileName, campaignName, mode.getModeName(), response.getStatusCode());
     }
 
     private static long getFileSizeInMB(Path filepath) {
@@ -676,6 +676,7 @@ private VariablesMap getVariablesMap(Mode modeSpecified,
         return variablesMap;
     }
 
+    //
     private static VariablesMap getVariablesMapWithPath(String metadataFilePath) throws GenesisException {
         if(metadataFilePath.endsWith(".xml")) {
             //Parse DDI

src/main/java/fr/insee/genesis/domain/service/metadata/QuestionnaireMetadataService.java

@@ -23,6 +23,7 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.util.List;
 
@@ -82,7 +83,7 @@ private void saveMetadata(String collectionInstrumentId, Mode mode, MetadataMode
      * @return VariablesMap or null if parsing fails
      */
     private MetadataModel readMetadatas(String campaignName, String modeName, FileUtils fileUtils,
-                                  List<GenesisError> errors) throws GenesisException{
+                                        List<GenesisError> errors) throws GenesisException{
 
         Path ddiFilePath;
         Path lunaticFilePath;
@@ -91,7 +92,8 @@ private MetadataModel readMetadatas(String campaignName, String modeName, FileUt
             ddiFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), DDI_FILE_PATTERN);
             lunaticFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), LUNATIC_FILE_PATTERN);
             metadataModel = parseMetadata(lunaticFilePath, ddiFilePath);
-        } catch (RuntimeException e) {
+        } catch (NoSuchFileException e) {
+            log.warn("Specification file missing for campaign={}, mode={}", campaignName, modeName);
             //DDI file not found and already log - Go to next step
         } catch (IOException e) {
             log.warn("No DDI File found for {}, {} mode. Will try to use Lunatic...", campaignName, modeName);

src/main/java/fr/insee/genesis/exceptions/GenesisExceptionHandler.java

@@ -55,15 +55,15 @@ public ResponseEntity<String> handleSpec(SpecificationNotFoundException exceptio
     }
 
     @ExceptionHandler(ReviewDisabledException.class)
-    public ResponseEntity<String> handleReviewDisabled(ReviewDisabledException ex) {
-        log.error("[{}] {}", ex.getClass().getSimpleName(), ex.getMessage());
+    public ResponseEntity<String> handleReviewDisabled(ReviewDisabledException exception) {
+        log.error("[{}] {}", exception.getClass().getSimpleName(), exception.getMessage());
         return ResponseEntity.status(HttpStatus.FORBIDDEN)
-                .body(ex.getMessage());
+                .body(exception.getMessage());
     }
 
     @ExceptionHandler(Exception.class)
-    public ResponseEntity<String> handleAny(Exception ex) {
-        log.error("Unexpected error (Type: {}) : {}", ex.getClass().getSimpleName(), ex.getMessage());
+    public ResponseEntity<String> handleAny(Exception exception) {
+        log.error("Unexpected error (Type: {}) : {}", exception.getClass().getSimpleName(), exception.getMessage(), exception);
         return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
                 .body("Internal server error");
     }

src/main/java/fr/insee/genesis/infrastructure/utils/FileUtils.java

@@ -13,6 +13,7 @@
 
 import java.io.*;
 import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
@@ -130,7 +131,7 @@ public List<String> listFolders(String dir) {
 	public Path findFile(String directory, String regex) throws IOException {
 		try (Stream<Path> files = Files.find(Path.of(directory), 1, (path, basicFileAttributes) -> path.toFile().getName().toLowerCase().matches(regex))) {
 			return files.findFirst()
-					.orElseThrow(() -> new RuntimeException("No file (%s) found in ".formatted(regex) + directory));
+					.orElseThrow(() -> new NoSuchFileException("No file (%s) found in %s".formatted(regex, directory)));
 		}
 	}