X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fsa%2Fsearchdbabstraction%2Felasticsearch%2Fdao%2FElasticSearchResultItem.java;h=529900d9f76b92470177db2c9645fe815730cb5c;hb=15af66b115f3e8046b2d0f2634fb77b3d835f730;hp=f59805e7448295c9765b112cdf42a276f268955b;hpb=71393bb2bf9fb10962723e61cf0e70d9aa202645;p=aai%2Fsearch-data-service.git

diff --git a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
index f59805e..529900d 100644
--- a/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
+++ b/src/main/java/org/onap/aai/sa/searchdbabstraction/elasticsearch/dao/ElasticSearchResultItem.java
@@ -24,125 +24,126 @@ import org.onap.aai.sa.rest.ApiUtils;
 
 public class ElasticSearchResultItem {
 
-  public static final String REQUEST_URL = "REQUEST_URL";
+    public static final String REQUEST_URL = "REQUEST_URL";
 
-  private ElasticSearchOperationStatus create;
-  private ElasticSearchOperationStatus index;
-  private ElasticSearchOperationStatus delete;
+    private ElasticSearchOperationStatus create;
+    private ElasticSearchOperationStatus index;
+    private ElasticSearchOperationStatus delete;
 
-  public ElasticSearchOperationStatus getCreate() {
-    return create;
-  }
-
-  public void setCreate(ElasticSearchOperationStatus index) {
-    this.create = index;
-  }
-
-  public ElasticSearchOperationStatus getIndex() {
-    return index;
-  }
-
-  public void setIndex(ElasticSearchOperationStatus index) {
-    this.index = index;
-  }
-
-  public ElasticSearchOperationStatus getDelete() {
-    return delete;
-  }
-
-  public void setDelete(ElasticSearchOperationStatus delete) {
-    this.delete = delete;
-  }
-
-  public String operationType() {
-
-    if (create != null) {
-      return "create";
-    }
-    if (index != null) {
-      return "update";
-    }
-    if (delete != null) {
-      return "delete";
+    public ElasticSearchOperationStatus getCreate() {
+        return create;
     }
 
-    return "unknown";
-  }
-
-  public ElasticSearchOperationStatus operationStatus() {
+    public void setCreate(ElasticSearchOperationStatus index) {
+        this.create = index;
+    }
 
-    if (create != null) {
-      return create;
+    public ElasticSearchOperationStatus getIndex() {
+        return index;
     }
-    if (index != null) {
-      return index;
+
+    public void setIndex(ElasticSearchOperationStatus index) {
+        this.index = index;
     }
-    if (delete != null) {
-      return delete;
+
+    public ElasticSearchOperationStatus getDelete() {
+        return delete;
     }
 
-    return null;
-  }
+    public void setDelete(ElasticSearchOperationStatus delete) {
+        this.delete = delete;
+    }
 
+    public String operationType() {
 
-  public String toJson() {
-    StringBuilder sb = new StringBuilder();
+        if (create != null) {
+            return "create";
+        }
+        if (index != null) {
+            return "update";
+        }
+        if (delete != null) {
+            return "delete";
+        }
 
-    sb.append("{");
+        return "unknown";
+    }
 
-    sb.append("\"operation\": \"").append(operationType()).append("\", ");
+    public ElasticSearchOperationStatus operationStatus() {
 
-    if (operationStatus().getAdditionalProperties().containsKey(REQUEST_URL)) {
-      sb.append("\"url\": \"").append(operationStatus().getAdditionalProperties()
-          .get(REQUEST_URL)).append("\", ");
-    } else {
-      sb.append("\"url\": \"").append(ApiUtils.buildDocumentUri(operationStatus()
-          .getIndex(), operationStatus().getId())).append("\", ");
-    }
+        if (create != null) {
+            return create;
+        }
+        if (index != null) {
+            return index;
+        }
+        if (delete != null) {
+            return delete;
+        }
 
-    // We don't want to include an etag field in the response in
-    // the case of a delete, since that would imply that the client
-    // could still access that version of the file in some manner
-    // (which we are not supporting).
-    if (!operationType().equals("delete")) {
-      sb.append("\"etag\": \"").append(operationStatus().getVersion()).append("\", ");
+        return null;
     }
-    sb.append("\"status-code\": \"").append(operationStatus().getStatus()).append("\", ");
-
-    sb.append("\"status-message\": \"");
-
-    if ((operationStatus().getStatus() >= 200) && (operationStatus().getStatus() < 300)) {
-      sb.append("OK");
-    } else {
-      // Sometimes the error object doesn't get populated, so check
-      // before we try to reference it...
-      if (operationStatus().getError() != null) {
-        sb.append(operationStatus().getError().getReason());
-      } else {
-        sb.append("");
-      }
-    }
-    sb.append("\"");
-    sb.append("}");
 
-    return sb.toString();
-  }
 
+    public String toJson() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("{");
+
+        sb.append("\"operation\": \"").append(operationType()).append("\", ");
+
+        if (operationStatus().getAdditionalProperties().containsKey(REQUEST_URL)) {
+            sb.append("\"url\": \"").append(operationStatus().getAdditionalProperties().get(REQUEST_URL))
+                    .append("\", ");
+        } else {
+            sb.append("\"url\": \"")
+                    .append(ApiUtils.buildDocumentUri(operationStatus().getIndex(), operationStatus().getId()))
+                    .append("\", ");
+        }
+
+        // We don't want to include an etag field in the response in
+        // the case of a delete, since that would imply that the client
+        // could still access that version of the file in some manner
+        // (which we are not supporting).
+        if (!operationType().equals("delete")) {
+            sb.append("\"etag\": \"").append(operationStatus().getVersion()).append("\", ");
+        }
+        sb.append("\"status-code\": \"").append(operationStatus().getStatus()).append("\", ");
+
+        sb.append("\"status-message\": \"");
+
+        if ((operationStatus().getStatus() >= 200) && (operationStatus().getStatus() < 300)) {
+            sb.append("OK");
+        } else {
+            // Sometimes the error object doesn't get populated, so check
+            // before we try to reference it...
+            if (operationStatus().getError() != null) {
+                sb.append(operationStatus().getError().getReason());
+            } else {
+                sb.append("");
+            }
+        }
+        sb.append("\"");
+        sb.append("}");
+
+        return sb.toString();
+    }
 
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
 
-    sb.append("ElasticSearchItemStatus [");
-    if (create != null) {
-      sb.append("create " + create);
-    } else if (index != null) {
-      sb.append("index " + index);
-    } else if (delete != null) {
-      sb.append("delete " + index);
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("ElasticSearchItemStatus [");
+        if (create != null) {
+            sb.append("create " + create);
+        } else if (index != null) {
+            sb.append("index " + index);
+        } else if (delete != null) {
+            sb.append("delete " + index);
+        }
+        sb.append("]");
+        return sb.toString();
     }
-    sb.append("]");
-    return sb.toString();
-  }
 
 }