Skip to content

Commit

Permalink
UPdate for #71, header handling issue that made the cache unusable wa…
Browse files Browse the repository at this point in the history 
…s partially fixed, load cache is still not good
  • Loading branch information
@tkohegyi
tkohegyi committed May 7, 2016
1 parent 426fdf8 commit a17eedc
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 44 deletions.
2 changes: 1 addition & 1 deletion ...rcuit/src/main/java/com/epam/wilma/extras/shortcircuit/ShortCircuitResponseGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public byte[] generateTemplate() {
@Override
public byte[] formatTemplate(WilmaHttpRequest wilmaHttpRequest, HttpServletResponse httpServletResponse,
byte[] bytes, ParameterList parameterList) throws Exception {
byte[] newBody = bytes;
byte[] newBody;
//prepare a key for this request
String hashCode = wilmaHttpRequest.getHeader(ShortCircuitChecker.SHORT_CIRCUIT_HEADER);
ShortCircuitResponseInformation shortCircuitResponseInformation = ShortCircuitChecker.getShortCircuitMap().get(hashCode);
Expand Down
6 changes: 5 additions & 1 deletion ...uit/src/main/java/com/epam/wilma/extras/shortcircuit/ShortCircuitResponseInformation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ class ShortCircuitResponseInformation {
setContentType(wilmaHttpResponse.getContentType());
setStatusCode(wilmaHttpResponse.getStatusCode());
setBody(wilmaHttpResponse.getBody());
setHeaders(wilmaHttpResponse.getHeaders());
Map<String, String> headers = wilmaHttpResponse.getHeaders();
//These two header is not necessary to be preserved
headers.remove("Content-Encoding");
headers.remove("Content-Length");
setHeaders(headers);
setHashCode(hashCode);
//need to clone the response perfectly
this.timeout = timeout;
Expand Down
82 changes: 40 additions & 42 deletions ...n/java/com/epam/wilma/extras/shortcircuit/ShortCircuitResponseInformationFileHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class ShortCircuitResponseInformationFileHandler {
private static final Object SHORT_CIRCUIT_MAP_GUARD = ShortCircuitChecker.getShortCircuitMapGuard();
private static Map<String, ShortCircuitResponseInformation> shortCircuitMap = ShortCircuitChecker.getShortCircuitMap();
private final Logger logger = LoggerFactory.getLogger(ShortCircuitResponseInformationFileHandler.class);
private final int e500 = 500;

/**
* Saves the map to a folder, to preserve it for later use.
Expand Down Expand Up @@ -90,6 +89,35 @@ String savePreservedMessagesFromMap(String path, FileFactory fileFactory, FileOu
return response;
}

private void saveMapObject(FileOutputStreamFactory fileOutputStreamFactory, File file, String entryKey, ShortCircuitResponseInformation information) 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 \"Key\": \"" + entryKey + "\",\n").getBytes());
fos.write((" \"ResponseCode\": " + information.getStatusCode() + ",\n").getBytes());
fos.write((" \"ContentType\": \"" + information.getContentType() + "\",\n").getBytes());
Map<String, String> headers = information.getHeaders();
fos.write(" \"Headers\": [".getBytes());
int j = 1;
for (String key : headers.keySet()) {
fos.write((" { \"" + key + "\": \"" + encodeString(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", encodeString(information.getBody().toString())).toString();
fos.write((myBody + "\n}").getBytes());
fos.close();
}

/**
* Load the map from a folder, and create a new map from it.
*
Expand Down Expand Up @@ -129,31 +157,23 @@ private ShortCircuitResponseInformation loadMapObject(String fileName) {
if (fileContent != null) {
JSONObject obj = new JSONObject(fileContent);
String hashKey = obj.getString("Key");
int responseCode;
try {
responseCode = Integer.valueOf(obj.getString("ResponseCode"));
} catch (NumberFormatException e) {
responseCode = e500; //E500 if cannot parse the response code
}
int responseCode = obj.getInt("ResponseCode");
String contentType = obj.getString("ContentType");
String body = obj.getJSONObject("Body").getString("Body");
String body = decodeString(obj.getJSONObject("Body").getString("Body"));
JSONArray headerArray = obj.getJSONArray("Headers");
if (hashKey != null && contentType != null && body != null && headerArray != null) {
ShortCircuitResponseInformation information = new ShortCircuitResponseInformation(Integer.MAX_VALUE);
information.setHashCode(hashKey);
information.setStatusCode(responseCode);
information.setContentType(contentType);
//CHECKSTYLE OFF - we must use "new String" here
body = new String(Base64.decodeBase64(body)); //make it human readable
//CHECKSTYLE ON
information.setBody(body);
Map<String, String> headers = new HashMap<>();
for (int i = 0; i < headerArray.length(); i++) {
JSONObject o = headerArray.getJSONObject(i);
Iterator j = o.keys();
while (j.hasNext()) {
String key = (String) j.next();
headers.put(key, o.getString(key));
headers.put(key, decodeString(o.getString(key)));
}
}
information.setHeaders(headers);
Expand All @@ -177,37 +197,15 @@ private String loadFileToString(final String fileName) {
return text;
}

private void saveMapObject(FileOutputStreamFactory fileOutputStreamFactory, File file, String entryKey, ShortCircuitResponseInformation information) 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 \"Key\": \"" + entryKey + "\",\n").getBytes());
fos.write((" \"ResponseCode\": \"" + information.getStatusCode() + "\",\n").getBytes());
fos.write((" \"ContentType\": \"" + information.getContentType() + "\",\n").getBytes());
Map<String, String> headers = information.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());
//CHECKSTYLE OFF - we must use "new String" here
String body = new String(Base64.encodeBase64(information.getBody().getBytes()));
private String encodeString(final String toBeEncoded) {
//CHECKSTYLE OFF - ignoring new String() error, as this is the most effective implementation
return new String(Base64.encodeBase64(toBeEncoded.getBytes()));
//CHECKSTYLE ON

String myBody = new JSONObject().put("Body", body).toString();
fos.write((myBody + "\n}").getBytes());
fos.close();
}

private String decodeString(final String toBeDecoded) {
//CHECKSTYLE OFF - ignoring new String() error, as this is the most effective implementation
return new String(Base64.decodeBase64(toBeDecoded.getBytes()));
//CHECKSTYLE ON
}
}

0 comments on commit a17eedc

Please sign in to comment.