wbrawner/Everest
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rid HistoryManager of isDuplicate() and areListsEqual() and add binary file path and raw body type as search priorities

Browse source
This commit is contained in:
Rohit Awate 2018-08-15 16:41:22 +05:30
parent 035a7cf0f1
commit 2d0cf380a7
No known key found for this signature in database
GPG key ID: 1051D7B79CF2EE25
6 changed files with 66 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/rohitawate/everest/controllers/DashboardController.java
View file

@ -556,8 +556,10 @@ public class DashboardController implements Initializable {
public ArrayList<FieldState> getParamFieldStates() {
ArrayList<FieldState> states = new ArrayList<>();
for (StringKeyValueFieldController controller : paramsControllers)
for (StringKeyValueFieldController controller : paramsControllers) {
if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty())
states.add(controller.getState());
}
return states;
}

8
src/main/java/com/rohitawate/everest/controllers/FormDataTabController.java
View file

@ -211,8 +211,10 @@ public class FormDataTabController implements Initializable {
public ArrayList<FieldState> getStringFieldStates() {
ArrayList<FieldState> states = new ArrayList<>();
for (StringKeyValueFieldController controller : stringControllers)
for (StringKeyValueFieldController controller : stringControllers) {
if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty())
states.add(controller.getState());
}
return states;
}
@ -224,8 +226,10 @@ public class FormDataTabController implements Initializable {
public ArrayList<FieldState> getFileFieldStates() {
ArrayList<FieldState> states = new ArrayList<>();
for (FileKeyValueFieldController controller : fileControllers)
for (FileKeyValueFieldController controller : fileControllers) {
if (!controller.isFileKeyFieldEmpty() && !controller.isFileValueFieldEmpty())
states.add(controller.getState());
}
return states;
}

4
src/main/java/com/rohitawate/everest/controllers/HeaderTabController.java
View file

@ -131,8 +131,10 @@ public class HeaderTabController implements Initializable {
public ArrayList<FieldState> getFieldStates() {
ArrayList<FieldState> states = new ArrayList<>();
for (StringKeyValueFieldController controller : controllers)
for (StringKeyValueFieldController controller : controllers) {
if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty())
states.add(controller.getState());
}
return states;
}

30
src/main/java/com/rohitawate/everest/controllers/HistoryItemController.java
View file

@ -26,7 +26,6 @@ import javafx.fxml.Initializable;
import javafx.scene.control.Label;
import javafx.scene.control.Tooltip;
import javax.ws.rs.core.MediaType;
import java.net.MalformedURLException;
import java.net.URL;
import java.time.LocalDateTime;
@ -113,37 +112,37 @@ public class HistoryItemController implements Initializable, Searchable<Composer
for (FieldState state : state.params) {
if (state.key.toLowerCase().contains(searchString) ||
state.value.toLowerCase().contains(searchString))
index += 5;
index += 7;
}
// Checks for a match in the headers
for (FieldState state : state.headers) {
if (state.key.toLowerCase().contains(searchString) ||
state.value.toLowerCase().contains(searchString))
index += 6;
index += 7;
}
if (!(state.httpMethod.equals(HTTPConstants.GET) || state.httpMethod.equals(HTTPConstants.DELETE))) {
switch (state.contentType) {
case MediaType.TEXT_PLAIN:
case MediaType.APPLICATION_JSON:
case MediaType.APPLICATION_XML:
case MediaType.TEXT_HTML:
case MediaType.APPLICATION_OCTET_STREAM:
// Checks for match in rawBody of the request
// Checks for match in body of the request
comparisonString = state.rawBody.toLowerCase();
if (comparisonString.contains(searchString))
index += 8;
break;
case MediaType.APPLICATION_FORM_URLENCODED:
comparisonString = state.rawBodyBoxValue.toLowerCase();
if (comparisonString.contains(searchString))
index += 6;
comparisonString = state.binaryFilePath.toLowerCase();
if (comparisonString.contains(searchString))
index += 8;
// Checks for match in string tuples
for (FieldState state : state.urlStringTuples) {
if (state.key.toLowerCase().contains(searchString) ||
state.value.toLowerCase().contains(searchString))
index += 8;
}
break;
case MediaType.MULTIPART_FORM_DATA:
// Checks for match in string and file tuples
for (FieldState state : state.formStringTuples) {
if (state.key.toLowerCase().contains(searchString) ||
@ -156,9 +155,8 @@ public class HistoryItemController implements Initializable, Searchable<Composer
state.value.toLowerCase().contains(searchString))
index += 8;
}
break;
}
}
return index;
}
}

4
src/main/java/com/rohitawate/everest/controllers/URLTabController.java
View file

@ -132,8 +132,10 @@ public class URLTabController implements Initializable {
public ArrayList<FieldState> getFieldStates() {
ArrayList<FieldState> states = new ArrayList<>();
for (StringKeyValueFieldController controller : controllers)
for (StringKeyValueFieldController controller : controllers) {
if (!controller.isKeyFieldEmpty() && !controller.isValueFieldEmpty())
states.add(controller.getState());
}
return states;
}

142
src/main/java/com/rohitawate/everest/history/HistoryManager.java
View file

@ -24,7 +24,6 @@ import com.rohitawate.everest.state.ComposerState;
import com.rohitawate.everest.state.FieldState;
import javafx.util.Pair;
import javax.ws.rs.core.MediaType;
import java.io.File;
import java.sql.*;
import java.time.LocalDate;
@ -91,9 +90,6 @@ public class HistoryManager {
* @param newState - The state of the Dashboard while making the request.
*/
public synchronized void saveHistory(ComposerState newState) {
// if (isDuplicate(state))
// return;
ComposerState lastState = getLastRequest();
if (newState.equals(lastState))
return;
@ -133,23 +129,14 @@ public class HistoryManager {
// Retrieves request body ContentType for querying corresponding table
state.contentType = getRequestContentType(requestID);
statement = conn.prepareStatement(Queries.selectRequestBody);
statement.setInt(1, requestID);
Pair<String, String> rawBodyAndType = getRequestBody(requestID);
ResultSet RS = statement.executeQuery();
if (RS.next()) {
state.rawBody = RS.getString("Body");
state.rawBodyBoxValue = RS.getString("Type");
if (rawBodyAndType != null) {
state.rawBody = rawBodyAndType.getKey();
state.rawBodyBoxValue = rawBodyAndType.getValue();
}
statement = conn.prepareStatement(Queries.selectFilePath);
statement.setInt(1, requestID);
RS = statement.executeQuery();
if (RS.next())
state.binaryFilePath = RS.getString("Path");
state.binaryFilePath = getFilePath(requestID);
state.urlStringTuples = getTuples(requestID, "URLString");
state.formStringTuples = getTuples(requestID, "FormString");
@ -191,8 +178,7 @@ public class HistoryManager {
ArrayList<FieldState> tuples = new ArrayList<>();
PreparedStatement statement =
conn.prepareStatement(Queries.selectTuplesByType);
PreparedStatement statement = conn.prepareStatement(Queries.selectTuplesByType);
statement.setInt(1, requestID);
statement.setString(2, type);
@ -271,120 +257,6 @@ public class HistoryManager {
return null;
}
/**
* Performs a comprehensive comparison of the new request with the one added last to the database.
*
* @param newState The new request.
* @return true, if request is same as the last one in the database. false, otherwise.
*/
private boolean isDuplicate(ComposerState newState) {
try {
statement = conn.prepareStatement(Queries.selectMostRecentRequest);
ResultSet RS = statement.executeQuery();
int lastRequestID = -1;
if (RS.next()) {
if (!(newState.httpMethod.equals(RS.getString("Type"))) ||
!(newState.target.equals(RS.getString("Target"))) ||
!(LocalDate.now().equals(LocalDate.parse(RS.getString("Date")))))
return false;
else
lastRequestID = RS.getInt("ID");
}
// This condition is observed when the database is empty
if (lastRequestID == -1)
return false;
ArrayList<FieldState> states;
// Checks for new or modified headers
states = getTuples(lastRequestID, "Header");
if (!areListsEqual(states, newState.headers))
return false;
// Checks for new or modified params
states = getTuples(lastRequestID, "Param");
if (!areListsEqual(states, newState.params))
return false;
if (!(newState.httpMethod.equals(HTTPConstants.GET) || newState.httpMethod.equals(HTTPConstants.DELETE))) {
statement = conn.prepareStatement(Queries.selectRequestContentType);
statement.setInt(1, lastRequestID);
RS = statement.executeQuery();
String previousContentType = "";
if (RS.next())
previousContentType = RS.getString("ContentType");
if (!newState.contentType.equals(previousContentType))
return false;
switch (newState.contentType) {
case MediaType.TEXT_PLAIN:
case MediaType.APPLICATION_JSON:
case MediaType.APPLICATION_XML:
case MediaType.TEXT_HTML:
case MediaType.APPLICATION_OCTET_STREAM:
statement = conn.prepareStatement(Queries.selectRequestBody);
statement.setInt(1, lastRequestID);
RS = statement.executeQuery();
while (RS.next()) {
if (!(RS.getString("Type").equals("Raw") &&
RS.getString("Body").equals(newState.rawBody)))
return false;
else if (!(RS.getString("Type").equals("FilePath") &&
RS.getString("Body").equals(newState.binaryFilePath)))
return false;
}
break;
case MediaType.APPLICATION_FORM_URLENCODED:
// Checks for new or modified string tuples
states = getTuples(lastRequestID, "URLString");
return areListsEqual(states, newState.urlStringTuples);
case MediaType.MULTIPART_FORM_DATA:
// Checks for new or modified string tuples
states = getTuples(lastRequestID, "FormString");
boolean stringComparison = areListsEqual(states, newState.formStringTuples);
// Checks for new or modified file tuples
states = getTuples(lastRequestID, "File");
boolean fileComparison = areListsEqual(states, newState.formFileTuples);
return stringComparison && fileComparison;
}
}
} catch (SQLException e) {
LoggingService.logWarning("Database error.", e, LocalDateTime.now());
} catch (NullPointerException NPE) {
/*
NPE is thrown by containsKey indicating that the key is not present in the database thereby
classifying it as a non-duplicate request.
*/
return false;
}
return true;
}
private static boolean areListsEqual(ArrayList<FieldState> firstList, ArrayList<FieldState> secondList) {
if (firstList == null && secondList == null) return true;
if ((firstList == null && secondList != null) || (firstList != null && secondList == null)) return false;
if (firstList.size() != secondList.size()) return false;
for (FieldState state : secondList) {
if (!state.isEmpty() && state.checked && !firstList.contains(state))
return false;
}
return true;
}
private class HistorySaver implements Runnable {
private ComposerState state;
@ -441,7 +313,6 @@ public class HistoryManager {
if (tuples.size() > 0) {
try {
for (FieldState fieldState : tuples) {
if (!fieldState.isEmpty() && fieldState.checked) {
statement = conn.prepareStatement(Queries.saveTuple);
statement.setInt(1, requestID);
statement.setString(2, tupleType);
@ -450,7 +321,6 @@ public class HistoryManager {
statement.setInt(5, fieldState.checked ? 1 : 0);
statement.addBatch();
}
}
statement.executeBatch();
} catch (SQLException e) {
LoggingService.logSevere("Database error.", e, LocalDateTime.now());