Adding UI extensibility

[aai/sparky-be.git] / src / main / java / org / onap / aai / sparky / sync / task / PerformElasticSearchUpdate.java

diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java b/src/main/java/org/onap/aai/sparky/sync/task/PerformElasticSearchUpdate.java
similarity index 57%
rename from src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java
rename to src/main/java/org/onap/aai/sparky/sync/task/PerformElasticSearchUpdate.java
index 72b48c9..1d8371f 100644 (file)
--- a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchUpdate.java
+++ b/src/main/java/org/onap/aai/sparky/sync/task/PerformElasticSearchUpdate.java
@@ -20,14 +20,14 @@
  *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
-package org.onap.aai.sparky.synchronizer.task;
+package org.onap.aai.sparky.sync.task;
 
 import java.util.Map;
 import java.util.function.Supplier;
 
+import org.onap.aai.restclient.client.OperationResult;
+import org.onap.aai.sparky.dal.ElasticSearchAdapter;
 import org.onap.aai.sparky.dal.NetworkTransaction;
-import org.onap.aai.sparky.dal.elasticsearch.ElasticSearchDataProvider;
-import org.onap.aai.sparky.dal.rest.OperationResult;
 import org.slf4j.MDC;
 
 /**
@@ -35,7 +35,7 @@ import org.slf4j.MDC;
  */
 public class PerformElasticSearchUpdate implements Supplier<NetworkTransaction> {
 
-  private ElasticSearchDataProvider esDataProvider;
+  private ElasticSearchAdapter esAdapter;
   private NetworkTransaction operationTracker;
   private String updatePayload;
   private String updateUrl;
@@ -50,10 +50,10 @@ public class PerformElasticSearchUpdate implements Supplier<NetworkTransaction>
    * @param transactionTracker the transaction tracker
    */
   public PerformElasticSearchUpdate(String updateUrl, String updatePayload,
-      ElasticSearchDataProvider esDataProvider, NetworkTransaction transactionTracker) {
+      ElasticSearchAdapter esAdapter, NetworkTransaction transactionTracker) {
     this.updateUrl = updateUrl;
     this.updatePayload = updatePayload;
-    this.esDataProvider = esDataProvider;
+    this.esAdapter = esAdapter;
     this.contextMap = MDC.getCopyOfContextMap();
     this.operationTracker = new NetworkTransaction();
     operationTracker.setEntityType(transactionTracker.getEntityType());
@@ -69,84 +69,12 @@ public class PerformElasticSearchUpdate implements Supplier<NetworkTransaction>
   @Override
   public NetworkTransaction get() {
     operationTracker.setTaskAgeInMs();
-    long startTimeInMs = System.currentTimeMillis();
     MDC.setContextMap(contextMap);
-    OperationResult or = esDataProvider.doBulkOperation(updateUrl, updatePayload);
-
-    or.setResponseTimeInMs(System.currentTimeMillis() - startTimeInMs);
+    long startTimeInMs = System.currentTimeMillis();
+    OperationResult or = esAdapter.doBulkOperation(updateUrl, updatePayload);
     operationTracker.setOperationResult(or);
-
-    return operationTracker;
-  }
-
-  /**
-   * @return the esDataProvider
-   */
-  public ElasticSearchDataProvider getEsDataProvider() {
-    return esDataProvider;
-  }
-
-  /**
-   * @param esDataProvider the esDataProvider to set
-   */
-  public void setEsDataProvider(ElasticSearchDataProvider esDataProvider) {
-    this.esDataProvider = esDataProvider;
-  }
-
-  /**
-   * @return the operationTracker
-   */
-  public NetworkTransaction getOperationTracker() {
+    operationTracker.setOpTimeInMs(System.currentTimeMillis() - startTimeInMs);
     return operationTracker;
   }
 
-  /**
-   * @param operationTracker the operationTracker to set
-   */
-  public void setOperationTracker(NetworkTransaction operationTracker) {
-    this.operationTracker = operationTracker;
-  }
-
-  /**
-   * @return the updatePayload
-   */
-  public String getUpdatePayload() {
-    return updatePayload;
-  }
-
-  /**
-   * @param updatePayload the updatePayload to set
-   */
-  public void setUpdatePayload(String updatePayload) {
-    this.updatePayload = updatePayload;
-  }
-
-  /**
-   * @return the updateUrl
-   */
-  public String getUpdateUrl() {
-    return updateUrl;
-  }
-
-  /**
-   * @param updateUrl the updateUrl to set
-   */
-  public void setUpdateUrl(String updateUrl) {
-    this.updateUrl = updateUrl;
-  }
-
-  /**
-   * @return the contextMap
-   */
-  public Map<String, String> getContextMap() {
-    return contextMap;
-  }
-
-  /**
-   * @param contextMap the contextMap to set
-   */
-  public void setContextMap(Map<String, String> contextMap) {
-    this.contextMap = contextMap;
-  }
-
 }