Adding UI extensibility

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

diff --git a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java b/src/main/java/org/onap/aai/sparky/sync/task/PerformElasticSearchRetrieval.java
similarity index 63%
rename from src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
rename to src/main/java/org/onap/aai/sparky/sync/task/PerformElasticSearchRetrieval.java
index f3f3c16..0f37a0d 100644 (file)
--- a/src/main/java/org/onap/aai/sparky/synchronizer/task/PerformElasticSearchRetrieval.java
+++ b/src/main/java/org/onap/aai/sparky/sync/task/PerformElasticSearchRetrieval.java
@@ -20,14 +20,16 @@
  *
  * 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 javax.ws.rs.core.MediaType;
+
+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.rest.OperationResult;
-import org.onap.aai.sparky.dal.rest.RestDataProvider;
 import org.slf4j.MDC;
 
 /**
@@ -36,7 +38,7 @@ import org.slf4j.MDC;
 public class PerformElasticSearchRetrieval implements Supplier<NetworkTransaction> {
 
   private NetworkTransaction txn;
-  private RestDataProvider restDataProvider;
+  private ElasticSearchAdapter esAdapter;
   private Map<String, String> contextMap;
 
   /**
@@ -46,9 +48,9 @@ public class PerformElasticSearchRetrieval implements Supplier<NetworkTransactio
    * @param restDataProvider the rest data provider
    */
   public PerformElasticSearchRetrieval(NetworkTransaction elasticSearchTxn,
-      RestDataProvider restDataProvider) {
+      ElasticSearchAdapter esAdapter) {
     this.txn = elasticSearchTxn;
-    this.restDataProvider = restDataProvider;
+    this.esAdapter = esAdapter;
     this.contextMap = MDC.getCopyOfContextMap();
   }
 
@@ -60,51 +62,11 @@ public class PerformElasticSearchRetrieval implements Supplier<NetworkTransactio
   @Override
   public NetworkTransaction get() {
     MDC.setContextMap(contextMap);
-    OperationResult or = restDataProvider.doGet(txn.getLink(), "application/json");
+    long startTimeInMs = System.currentTimeMillis();
+    OperationResult or = esAdapter.doGet(txn.getLink(), MediaType.APPLICATION_JSON_TYPE);
     txn.setOperationResult(or);
+    txn.setOpTimeInMs(System.currentTimeMillis() - startTimeInMs);
     return txn;
   }
 
-  /**
-   * @return the txn
-   */
-  public NetworkTransaction getTxn() {
-    return txn;
-  }
-
-  /**
-   * @param txn the txn to set
-   */
-  public void setTxn(NetworkTransaction txn) {
-    this.txn = txn;
-  }
-
-  /**
-   * @return the restDataProvider
-   */
-  public RestDataProvider getRestDataProvider() {
-    return restDataProvider;
-  }
-
-  /**
-   * @param restDataProvider the restDataProvider to set
-   */
-  public void setRestDataProvider(RestDataProvider restDataProvider) {
-    this.restDataProvider = restDataProvider;
-  }
-
-  /**
-   * @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;
-  }
-
 }