Skip to content

Commit

Permalink
further #71 updates
Browse files Browse the repository at this point in the history 
- minor restructure of save map part
- start implementation of the load map part
  • Loading branch information
@tkohegyi
tkohegyi committed Mar 20, 2016
1 parent afccf14 commit c167ac3
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 41 deletions.
1 change: 0 additions & 1 deletion ...ort.circuit/src/main/java/com/epam/wilma/extras/shortcircuit/ShortCircuitInterceptor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ public void onResponseReceive(WilmaHttpResponse wilmaHttpResponse, ParameterList
@Override
public String handleRequest(HttpServletRequest httpServletRequest, String request, HttpServletResponse httpServletResponse) {
String myMethod = httpServletRequest.getMethod();
String myQueryString = httpServletRequest.getQueryString();
boolean myCall = request.equalsIgnoreCase(this.getClass().getSimpleName() + HANDLED_SERVICE);

//set default response
Expand Down
134 changes: 94 additions & 40 deletions ...circuit/src/main/java/com/epam/wilma/extras/shortcircuit/ShortCircuitInterceptorCore.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* This class provides the Short Circuit Service calls.
Expand All @@ -55,7 +58,8 @@ public class ShortCircuitInterceptorCore {

/**
* Method that handles GET (all) and DELETE (all) methods on the actual Short Circuit Map.
* @param myMethod is expected as either GET or DELETE
*
* @param myMethod is expected as either GET or DELETE
* @param httpServletResponse is the response object
* @return with the response body (and with the updated httpServletResponse object
*/
Expand All @@ -75,8 +79,9 @@ protected String handleBasicCall(String myMethod, HttpServletResponse httpServle

/**
* Method that handles request to save and load the Short Circuit Map.
* @param myMethod POST (for Save) and GET (for Load) and DELETE for a selected
* @param folder is the folder to be used, or the identifier of the entry to be deleted
*
* @param myMethod POST (for Save) and GET (for Load) and DELETE for a selected
* @param folder is the folder to be used, or the identifier of the entry to be deleted
* @param httpServletResponse is the response object
* @return with the response body (and with the updated httpServletResponse object
*/
Expand All @@ -88,16 +93,16 @@ protected String handleComplexCall(String myMethod, String folder, HttpServletRe
}
if ("get".equalsIgnoreCase(myMethod)) {
//load map (from files) (get + circuits?folder=....)
//TODO
response = getShortCircuitMap(httpServletResponse);
response = loadPreservedMessagesToMap(httpServletResponse, folder);
}
return response;
}

/**
* Method that deletes a single entry from the map.
* @param myMethod POST (for Save) and GET (for Load) and DELETE for a selected
* @param id is the id of the ap entry to be deleted
*
* @param myMethod POST (for Save) and GET (for Load) and DELETE for a selected
* @param id is the id of the ap entry to be deleted
* @param httpServletResponse is the response object
* @return with the response body (and with the updated httpServletResponse object
*/
Expand All @@ -113,51 +118,27 @@ protected String handleComplexDeleteCall(String myMethod, String id, HttpServlet

/**
* Saves the map to a folder, to preserve it for later use.
*
* @param httpServletResponse is the response object
* @param myQueryString is the folder to be used, under Wilma'S log folder.
* @param folder is the folder to be used, under Wilma'S message folder.
* @return with the response body - that is a json info about the result of the call
*/
protected String savePreservedMessagesFromMap(HttpServletResponse httpServletResponse, String myQueryString) {
protected String savePreservedMessagesFromMap(HttpServletResponse httpServletResponse, String folder) {
String response = null;
String path = logFilePathProvider.getLogFilePath() + "/" + myQueryString + "/";
String path = logFilePathProvider.getLogFilePath() + "/" + folder + "/";
String filenamePrefix = "sc" + UniqueIdGenerator.getNextUniqueId() + "_";
if (!shortCircuitMap.isEmpty()) {
String[] keySet = shortCircuitMap.keySet().toArray(new String[shortCircuitMap.size()]);
for (int i = 0; i < keySet.length; i++) {
String entryKey = keySet[i];
ShortCircuitResponseInformation information = shortCircuitMap.get(entryKey);
if (information != null) {
//save this into file, folder is in myQueryString
//save this into file, folder is in folder variable
String filename = path + filenamePrefix + UniqueIdGenerator.getNextUniqueId() + ".json";
WilmaHttpResponse wilmaHttpResponse = information.getWilmaHttpResponse();
File file = fileFactory.createFile(filename);
try {
// if file does not exists, then create it
if (!file.exists()) {
if (file.getParentFile() != null) {
file.getParentFile().mkdirs();
}
file.createNewFile();
}
FileOutputStream fos = fileOutputStreamFactory.createFileOutputStream(file);
fos.write(("{\n \"URL\": \"" + entryKey + "\",\n").getBytes());
fos.write((" \"ResponseCode\": \"" + wilmaHttpResponse.getStatusCode() + "\",\n").getBytes());
fos.write((" \"ContentType\": \"" + wilmaHttpResponse.getContentType() + "\",\n").getBytes());
Map<String, String> headers = wilmaHttpResponse.getHeaders();
fos.write(" \"Headers\": [".getBytes());
int j = 1;
for (String key : headers.keySet()) {
fos.write((" { \"" + key + "\": \"" + headers.get(key) + "\" }").getBytes());
if (j != headers.size()) {
fos.write(",".getBytes());
}
fos.write("\n".getBytes());
j++;
}
fos.write(" ],\n \"Body\": ".getBytes());
String myBody = new JSONObject().put("Body", wilmaHttpResponse.getBody()).toString();
fos.write((myBody + "\n}").getBytes());
fos.close();
saveMapObject(file, entryKey, wilmaHttpResponse);
} catch (IOException e) {
String message = "Map save failed at file: " + filename + ", with message: " + e.getLocalizedMessage();
logger.info("ShortCircuit: " + message);
Expand All @@ -177,12 +158,84 @@ protected String savePreservedMessagesFromMap(HttpServletResponse httpServletRes
return response;
}

/**
* Load the map from a folder, and create a new map from it.
*
* @param httpServletResponse is the response object
* @param folder is the folder to be used, under Wilma'S message folder.
* @return with the response body - that is a json info about the result of the call
*/
private String loadPreservedMessagesToMap(HttpServletResponse httpServletResponse, String folder) {
String response = null;
Map<String, ShortCircuitResponseInformation> shortCircuitMap = new HashMap<>();

String path = logFilePathProvider.getLogFilePath() + "/" + folder;
File folderFile = new File(path);
File[] listOfFiles = folderFile.listFiles();
for (int i = 0; i < listOfFiles.length; i++) {
if (listOfFiles[i].isFile()) {
String pattern = "sc*.json";
// Create a Pattern object
Pattern r = Pattern.compile(pattern);
// Now create matcher object.
Matcher m = r.matcher(listOfFiles[i].getName());
if (m.find()) {
WilmaHttpResponse mapObject = loadMapObject(listOfFiles[i].getName());
if (mapObject != null) {
ShortCircuitResponseInformation info = new ShortCircuitResponseInformation(mapObject, Long.MAX_VALUE);
shortCircuitMap.put(Integer.toString(i), info);
}
}
}
}
//TODO still need:
// - replacement of the used map object
// - provide the right response
return null;
}

private WilmaHttpResponse loadMapObject(String fileName) {
//TODO still need:
// - load the file into a WilmaHttpResponse object, if possible
return null;
}

private void saveMapObject(File file, String entryKey, WilmaHttpResponse wilmaHttpResponse) throws IOException {
// if file does not exists, then create it
if (!file.exists()) {
if (file.getParentFile() != null) {
file.getParentFile().mkdirs();
}
file.createNewFile();
}
FileOutputStream fos = fileOutputStreamFactory.createFileOutputStream(file);
fos.write(("{\n \"URL\": \"" + entryKey + "\",\n").getBytes());
fos.write((" \"ResponseCode\": \"" + wilmaHttpResponse.getStatusCode() + "\",\n").getBytes());
fos.write((" \"ContentType\": \"" + wilmaHttpResponse.getContentType() + "\",\n").getBytes());
Map<String, String> headers = wilmaHttpResponse.getHeaders();
fos.write(" \"Headers\": [".getBytes());
int j = 1;
for (String key : headers.keySet()) {
fos.write((" { \"" + key + "\": \"" + headers.get(key) + "\" }").getBytes());
if (j != headers.size()) {
fos.write(",".getBytes());
}
fos.write("\n".getBytes());
j++;
}
fos.write(" ],\n \"Body\": ".getBytes());
String myBody = new JSONObject().put("Body", wilmaHttpResponse.getBody()).toString();
fos.write((myBody + "\n}").getBytes());
fos.close();
}

/**
* Method that is used to preserve the response when it arrives first time.
* Note that only responses with 200 response code will be preserved.
*
* @param shortCircuitHashCode is the hash code used as key in the Short Circuit Map
* @param wilmaHttpResponse is the response object
* @param parameterList may contain the timeout value to be used for the entry
* @param wilmaHttpResponse is the response object
* @param parameterList may contain the timeout value to be used for the entry
*/
protected void preserveResponse(String shortCircuitHashCode, WilmaHttpResponse wilmaHttpResponse, ParameterList parameterList) {
long timeout;
Expand All @@ -192,7 +245,7 @@ protected void preserveResponse(String shortCircuitHashCode, WilmaHttpResponse w
if (shortCircuitResponseInformation == null) {
//we need to store the response now
//but first check if response code is 200 - we store only those responses
if (wilmaHttpResponse.getStatusCode() == 200) {
if (wilmaHttpResponse.getStatusCode() == HttpServletResponse.SC_OK) {
String timeoutParameterName = "timeout";
if (parameterList != null && parameterList.get(timeoutParameterName) != null) {
timeout = Long.valueOf(parameterList.get(timeoutParameterName))
Expand All @@ -217,6 +270,7 @@ protected void preserveResponse(String shortCircuitHashCode, WilmaHttpResponse w

/**
* List the actual status of the Shour Circuit Map.
*
* @param httpServletResponse is the response object
* @return with the response body (and with the updated httpServletResponse object
*/
Expand Down

0 comments on commit c167ac3

Please sign in to comment.