diff --git a/src/main/java/fr/insee/genesis/configuration/LogRequestFilter.java b/src/main/java/fr/insee/genesis/configuration/LogRequestFilter.java index 7ce62ddc..e6ca944a 100644 --- a/src/main/java/fr/insee/genesis/configuration/LogRequestFilter.java +++ b/src/main/java/fr/insee/genesis/configuration/LogRequestFilter.java @@ -26,15 +26,11 @@ public class LogRequestFilter extends OncePerRequestFilter { "CALL {} {} - " // + "Content-Type : {} \n " // + "Headers : {} \n " - + "Params : {} - " - + "Body : {} \n "; + + "Params : {}"; private static final String RESPONSE_MESSAGE_FORMAT = "END {} {} - " - + "Status : {} - " - // + "Content-Type : {} \n " - // + "Headers : {} \n " - + "Body : {} \n"; + + "Status : {} - "; @Override protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) @@ -45,11 +41,10 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse ContentCachingResponseWrapper resp = new ContentCachingResponseWrapper(response); log.info(REQUEST_MESSAGE_FORMAT, - req.getMethod(), req.getRequestURI(), + req.getMethod(), req.getRequestURI(), // req.getContentType(), // new ServletServerHttpRequest(req).getHeaders(), //Headers - request.getQueryString(),//Params - new String(req.getContentAsByteArray(), StandardCharsets.UTF_8));//Body + request.getQueryString());//Params // Execution request chain @@ -57,9 +52,8 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse log.info(RESPONSE_MESSAGE_FORMAT, - req.getMethod(), req.getRequestURI(), - resp.getStatus(), - getResponseBody(req, resp)); //Body + req.getMethod(), req.getRequestURI(), + resp.getStatus()); //Body // Finally remember to respond to the client with the cached data. resp.copyBodyToResponse(); diff --git a/src/main/java/fr/insee/genesis/controller/utils/ControllerUtils.java b/src/main/java/fr/insee/genesis/controller/utils/ControllerUtils.java index 4ee68063..67c5ed73 100644 --- a/src/main/java/fr/insee/genesis/controller/utils/ControllerUtils.java +++ b/src/main/java/fr/insee/genesis/controller/utils/ControllerUtils.java @@ -4,6 +4,7 @@ import java.util.Collections; import java.util.List; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -12,6 +13,7 @@ import fr.insee.genesis.infrastructure.utils.FileUtils; @Component +@Slf4j public class ControllerUtils { private final FileUtils fileUtils; @@ -30,11 +32,17 @@ public List getModesList(String campaign, Mode modeSpecified) throws Genes } List modes = new ArrayList<>(); String specFolder = fileUtils.getSpecFolder(campaign); - List specFolders = fileUtils.listFolders(specFolder); - if (specFolders.isEmpty()) { + List modeSpecFolders = fileUtils.listFolders(specFolder); + if (modeSpecFolders.isEmpty()) { throw new GenesisException(404, "No specification folder found " + specFolder); } - specFolders.forEach(modeLabel -> modes.add(Mode.getEnumFromModeName(modeLabel))); + for(String modeSpecFolder : modeSpecFolders){ + if(Mode.getEnumFromModeName(modeSpecFolder) == null) { + log.warn("There is an invalid mode folder name in spec folder : {}", modeSpecFolder); + continue; + } + modes.add(Mode.getEnumFromModeName(modeSpecFolder)); + } if (modes.contains(Mode.F2F) && modes.contains(Mode.TEL)) { throw new GenesisException(409, "Cannot treat simultaneously TEL and FAF modes"); }