Support for MariaDB

[ccsdk/features.git] / sdnr / wt / data-provider / provider / src / main / java / org / onap / ccsdk / features / sdnr / wt / dataprovider / impl / MediatorServerDataProvider.java

diff --git a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/MediatorServerDataProvider.java b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/MediatorServerDataProvider.java
similarity index 65%
rename from sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/MediatorServerDataProvider.java
rename to sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/MediatorServerDataProvider.java
index c4fe672..7ae7a7d 100644 (file)
--- a/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/data/MediatorServerDataProvider.java
+++ b/sdnr/wt/data-provider/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/impl/MediatorServerDataProvider.java
@@ -19,7 +19,7 @@
  * ============LICENSE_END=========================================================
  *
  */
-package org.onap.ccsdk.features.sdnr.wt.dataprovider.data;
+package org.onap.ccsdk.features.sdnr.wt.dataprovider.impl;
 
 import java.util.HashMap;
 import java.util.List;
@@ -27,12 +27,8 @@ import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient;
-import org.onap.ccsdk.features.sdnr.wt.common.database.SearchResult;
-import org.onap.ccsdk.features.sdnr.wt.common.database.config.HostInfo;
-import org.onap.ccsdk.features.sdnr.wt.dataprovider.data.acessor.DataObjectAcessorWithId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.Entity;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.read.mediator.server.list.output.Data;
+import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.HtDatabaseMediatorserver;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.MediatorServerEntity;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,26 +36,20 @@ public class MediatorServerDataProvider implements AutoCloseable {
 
     private static final Logger LOG = LoggerFactory.getLogger(MediatorServerDataProvider.class);
 
-    private final HtDatabaseClient dbClient;
-    private final DataObjectAcessorWithId<Data> mediatorserverRW;
+    private final HtDatabaseMediatorserver dbClient;
     private final int REFRESH_INTERVAL = 60;
-    private final Map<String, Data> entries;
+    private final Map<String, MediatorServerEntity> entries;
     private final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
     private boolean isRunning;
 
-    public MediatorServerDataProvider(HostInfo[] hosts) throws Exception {
-        this(hosts, null, null, false);
-    }
-
-    public MediatorServerDataProvider(HostInfo[] hosts, String authUsername, String authPassword, boolean trustAll) throws Exception {
-        super();
-        LOG.info("Start {}", this.getClass().getName());
+    public MediatorServerDataProvider(HtDatabaseMediatorserver entryProvider) {
         this.entries = new HashMap<>();
-        this.dbClient = HtDatabaseClient.getClient(hosts, authUsername, authPassword, trustAll);
-        this.mediatorserverRW = new DataObjectAcessorWithId<>(dbClient, Entity.MediatorServer, Data.class);
+        this.dbClient = entryProvider;
         this.scheduler.scheduleAtFixedRate(onTick, this.REFRESH_INTERVAL, this.REFRESH_INTERVAL, TimeUnit.SECONDS);
+        LOG.info("Start {}", this.getClass().getName());
     }
 
+
     private final Runnable onTick = new Runnable() {
 
         @Override
@@ -72,9 +62,8 @@ public class MediatorServerDataProvider implements AutoCloseable {
     };
 
     private void runIt() {
-        SearchResult<Data> result = MediatorServerDataProvider.this.mediatorserverRW.doReadAll();
-        List<Data> data = result.getHits();
-        for (Data item : data) {
+        List<MediatorServerEntity> result = this.dbClient.getAll();
+        for (MediatorServerEntity item : result) {
             MediatorServerDataProvider.this.entries.put(item.getId(), item);
         }
     }
@@ -85,7 +74,7 @@ public class MediatorServerDataProvider implements AutoCloseable {
      * @return url or null if not exists
      */
     public String getHostUrl(String dbServerId) {
-        Data info = this.entries.getOrDefault(dbServerId, null);
+        MediatorServerEntity info = this.entries.getOrDefault(dbServerId, null);
         return info == null ? null : info.getUrl();
     }