continuer les modifs

Author: Hajarel-moukh

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

@@ -543,7 +543,6 @@ private void processCampaignWithMode(String campaignName, Mode mode, String root
             }
         } catch (IOException | ParserConfigurationException | SAXException | XMLStreamException e) {
 
-            // Wrap technique -> métier
             throw new GenesisException(
                     HttpStatus.INTERNAL_SERVER_ERROR,
                     "Error while importing campaign %s (mode %s)"

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

@@ -93,16 +93,19 @@ private MetadataModel readMetadatas(String campaignName, String modeName, FileUt
             lunaticFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), LUNATIC_FILE_PATTERN);
             metadataModel = parseMetadata(lunaticFilePath, ddiFilePath);
         } catch (NoSuchFileException e) {
-            log.warn("Specification file missing for campaign={}, mode={}", campaignName, modeName);
+            log.debug("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);
         }
         if(metadataModel == null ){
-            log.warn("DDI not found or error occurred. Trying Lunatic metadata...for {}, {} mode", campaignName, modeName);
+            log.debug("DDI not found or error occurred. Trying Lunatic metadata...for {}, {} mode", campaignName, modeName);
             try {
                 lunaticFilePath = fileUtils.findFile(String.format("%s/%s", fileUtils.getSpecFolder(campaignName), modeName), LUNATIC_FILE_PATTERN);
                 return parseMetadata(lunaticFilePath, null);
+            } catch (NoSuchFileException e) {
+                log.debug("No Lunatic specification file found for campaign={}, mode={}", campaignName, modeName);
+                return null;
             } catch (Exception ex) {
                 log.error("Error reading Lunatic metadata file", ex);
                 errors.add(new GenesisError(ex.toString()));

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

@@ -63,8 +63,12 @@ public ResponseEntity<String> handleReviewDisabled(ReviewDisabledException excep
 
     @ExceptionHandler(Exception.class)
     public ResponseEntity<String> handleAny(Exception exception) {
-        log.error("Unexpected error (Type: {}) : {}", exception.getClass().getSimpleName(), exception.getMessage(), exception);
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+        log.error("Unexpected error (Type: {}) : {}",
+                exception.getClass().getSimpleName(),
+                exception.getMessage(),
+                exception);
+        return ResponseEntity
+                .status(HttpStatus.INTERNAL_SERVER_ERROR)
                 .body("Internal server error");
     }
 }