From 7964e8aa9b9748678f6dadfe7b0c17c936679351 Mon Sep 17 00:00:00 2001 From: Michael Dürre Date: Thu, 15 Aug 2024 10:04:54 +0200 Subject: migrate sdnr features to potassium MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit adapt features and poms for potassium-sr2 Issue-ID: CCSDK-4046 Change-Id: I67e8fc442811eca40c19f1f3777f1a36812d3e35 Signed-off-by: Michael Dürre --- .../sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java | 2 +- .../features/sdnr/wt/dataprovider/database/sqldb/query/SqlQuery.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'sdnr/wt/data-provider/dblib/src/main/java/org') diff --git a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java index 02930304b..1ac129a9b 100644 --- a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java +++ b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/data/SqlDBDataProvider.java @@ -567,7 +567,7 @@ public class SqlDBDataProvider extends HtDatabaseEventsService implements Databa } return this.dbClient.write(query); } else { - this.controllerId = data.getString(0); + this.controllerId = data.getString(1); LOG.trace("controllerId already set"); } return true; diff --git a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SqlQuery.java b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SqlQuery.java index 89638cc8b..70543387d 100644 --- a/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SqlQuery.java +++ b/sdnr/wt/data-provider/dblib/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/database/sqldb/query/SqlQuery.java @@ -40,7 +40,7 @@ import org.onap.ccsdk.features.sdnr.wt.dataprovider.database.sqldb.query.filters import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.NetconfTimeStamp; import org.onap.ccsdk.features.sdnr.wt.dataprovider.model.types.NetconfTimeStampImpl; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.entity.input.Filter; -import io.netty.util.internal.StringUtil; + public interface SqlQuery { @@ -79,7 +79,8 @@ public interface SqlQuery { } if (!filters2.isEmpty()) { sb.append(" WHERE "); - sb.append(StringUtil.join(" AND ", filters2)); + sb.append(String.join(" AND ", filters2)); + } return sb.toString(); } -- cgit 1.2.3-korg