Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions src/main/java/fr/insee/genesis/configuration/LogRequestFilter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -45,21 +41,19 @@ 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
filterChain.doFilter(req, resp);


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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -12,6 +13,7 @@
import fr.insee.genesis.infrastructure.utils.FileUtils;

@Component
@Slf4j
public class ControllerUtils {

private final FileUtils fileUtils;
Expand All @@ -30,11 +32,17 @@ public List<Mode> getModesList(String campaign, Mode modeSpecified) throws Genes
}
List<Mode> modes = new ArrayList<>();
String specFolder = fileUtils.getSpecFolder(campaign);
List<String> specFolders = fileUtils.listFolders(specFolder);
if (specFolders.isEmpty()) {
List<String> 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");
}
Expand Down
Loading