diff options
| author |   highstreetherbert <herbert.eiselt@highstreet-technologies.com> | 2020-07-13 19:05:55 +0200 |
|---|---|---|
| committer | highstreetherbert <herbert.eiselt@highstreet-technologies.com> | 2020-07-15 10:40:35 +0200 |
| commit | 7dfb26b3c3a35fe73684019fbcf68ab6c9cf091a (patch) | |
| tree | d2b3fac81dcfabd5c463bc2071e1f477236e744c /sdnr/wt/data-provider/setup/src/main | |
| parent | 5dfcc4c815f930edb9fc9f5f94a9ef6d9791a709 (diff) | |
SDN-R common Elasticsearch 7.x support
Extend SDN-R common for Elasticsearch 7.x support
Issue-ID: SDNC-1284
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I4c4f66f73f8adbdf2a9ba4f77d1e2d274ce49892
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Diffstat (limited to 'sdnr/wt/data-provider/setup/src/main')
| -rw-r--r-- | sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java index 821e3ec1e..dabe0047f 100644 --- a/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java +++ b/sdnr/wt/data-provider/setup/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/setup/DataMigrationProviderImpl.java @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Set; - import org.json.JSONObject; import org.onap.ccsdk.features.sdnr.wt.common.database.HtDatabaseClient; import org.onap.ccsdk.features.sdnr.wt.common.database.Portstatus; @@ -53,8 +52,8 @@ import org.onap.ccsdk.features.sdnr.wt.common.database.responses.ListAliasesResp import org.onap.ccsdk.features.sdnr.wt.common.database.responses.ListIndicesResponse; import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.ComponentData; import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.ComponentName; -import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.DataMigrationReport; import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.DataContainer; +import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.DataMigrationReport; import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.Release; import org.onap.ccsdk.features.sdnr.wt.dataprovider.setup.data.SearchHitConverter; import org.slf4j.Logger; @@ -72,7 +71,11 @@ public class DataMigrationProviderImpl implements DataMigrationProviderService { if (timeoutms > 0) { Portstatus.waitSecondsTillAvailable(timeoutms / 1000, hosts); } - this.dbClient = new HtDatabaseClient(hosts, username, password, trustAll); + try { + this.dbClient = HtDatabaseClient.getClient(hosts, username, password, trustAll); + } catch (Exception e) { + throw new IllegalArgumentException("Can not reach database with parameters.",e); + } } @Override |