Code Review
/
aai
/
search-data-service.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix minor code smells
[aai/search-data-service.git]
/
src
/
main
/
java
/
org
/
onap
/
aai
/
sa
/
searchdbabstraction
/
elasticsearch
/
dao
/
ElasticSearchHttpController.java
diff --git
a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
index
a0b72f7
..
6d08c1d
100644
(file)
--- a/
src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
+++ b/
src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchHttpController.java
@@
-54,7
+54,6
@@
import java.util.Properties;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.Response.Status;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.ws.rs.HttpMethod;
import javax.ws.rs.core.Response.Status;
-import javax.ws.rs.core.Response.Status.Family;
import javax.ws.rs.core.UriBuilder;
import org.eclipse.jetty.http.HttpStatus;
import org.json.simple.JSONArray;
import javax.ws.rs.core.UriBuilder;
import org.eclipse.jetty.http.HttpStatus;
import org.json.simple.JSONArray;
@@
-641,11
+640,8
@@
public class ElasticSearchHttpController implements DocumentStoreInterface {
MdcOverride override = getStartTime(new MdcOverride());
HttpURLConnection conn = createConnection(url, HttpMethod.PUT);
MdcOverride override = getStartTime(new MdcOverride());
HttpURLConnection conn = createConnection(url, HttpMethod.PUT);
-
-
attachDocument(conn, document);
attachDocument(conn, document);
-
opResult = getOperationResult(conn);
buildDocumentResult(opResult, indexName);
opResult = getOperationResult(conn);
buildDocumentResult(opResult, indexName);
@@
-759,7
+755,7
@@
public class ElasticSearchHttpController implements DocumentStoreInterface {
InputStream inputStream = null;
InputStream inputStream = null;
- if (!
isSucces
sCode(resultCode)) {
+ if (!
ApiUtils.isSuccessStatu
sCode(resultCode)) {
inputStream = conn.getErrorStream();
} else {
try {
inputStream = conn.getErrorStream();
} else {
try {
@@
-842,11
+838,7
@@
public class ElasticSearchHttpController implements DocumentStoreInterface {
}
private boolean isSuccess(OperationResult result) {
}
private boolean isSuccess(OperationResult result) {
- return isSuccessCode(result.getResultCode());
- }
-
- private boolean isSuccessCode(int statusCode) {
- return Family.familyOf(statusCode).equals(Family.SUCCESSFUL);
+ return ApiUtils.isSuccessStatusCode(result.getResultCode());
}
private UriBuilder createUriBuilder(String path, String... paths) {
}
private UriBuilder createUriBuilder(String path, String... paths) {
@@
-1216,7
+1208,7
@@
public class ElasticSearchHttpController implements DocumentStoreInterface {
// Increment the operation counts.
totalOps++;
// Increment the operation counts.
totalOps++;
- if (
isSucces
sCode(item.operationStatus().getStatus())) {
+ if (
ApiUtils.isSuccessStatu
sCode(item.operationStatus().getStatus())) {
totalSuccess++;
} else {
totalFails++;
totalSuccess++;
} else {
totalFails++;