aboutsummaryrefslogtreecommitdiffstats
path: root/sdnr/wt/data-provider/model/src
diff options
context:
space:
mode:
authorMichael Dürre <michael.duerre@highstreet-technologies.com>2024-08-15 10:04:54 +0200
committerDan Timoney <dtimoney@att.com>2024-09-12 15:48:04 -0400
commit7964e8aa9b9748678f6dadfe7b0c17c936679351 (patch)
treef4859812acd6ccccdaa698c567bb121f03f7b985 /sdnr/wt/data-provider/model/src
parent556306410bc9c3a421cde351d287adeb705d1e8c (diff)
migrate sdnr features to potassium
adapt features and poms for potassium-sr2 Issue-ID: CCSDK-4046 Change-Id: I67e8fc442811eca40c19f1f3777f1a36812d3e35 Signed-off-by: Michael Dürre <michael.duerre@highstreet-technologies.com>
Diffstat (limited to 'sdnr/wt/data-provider/model/src')
-rw-r--r--sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java9
-rw-r--r--sdnr/wt/data-provider/model/src/main/yang/data-provider.yang (renamed from sdnr/wt/data-provider/model/src/main/yang/data-provider@2020-11-10.yang)0
2 files changed, 5 insertions, 4 deletions
diff --git a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java
index d0169ce06..5c06130dc 100644
--- a/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java
+++ b/sdnr/wt/data-provider/model/src/main/java/org/onap/ccsdk/features/sdnr/wt/dataprovider/model/types/YangHelper2.java
@@ -30,8 +30,9 @@ import java.util.List;
import java.util.Map;
import org.eclipse.jdt.annotation.NonNull;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.data.provider.rev201110.SortOrder;
-import org.opendaylight.yangtools.yang.binding.Identifiable;
-import org.opendaylight.yangtools.yang.binding.Identifier;
+
+import org.opendaylight.yangtools.yang.binding.Key;
+import org.opendaylight.yangtools.yang.binding.KeyAware;
import org.opendaylight.yangtools.yang.common.Uint16;
import org.opendaylight.yangtools.yang.common.Uint32;
import org.opendaylight.yangtools.yang.common.Uint64;
@@ -84,7 +85,7 @@ public class YangHelper2 {
/**
* Aluminium version
*/
- public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMap(Class<K> clazz, List<T> list) {
+ public static <K extends Key<T>,T extends KeyAware<K>> Map<K, T> getListOrMap(Class<K> clazz, List<T> list) {
Map<K,T> map = new HashMap<>();
for(T listelement:list) {
Constructor<K> constructor;
@@ -98,7 +99,7 @@ public class YangHelper2 {
}
return map;
}
- public static <K extends Identifier<T>,T extends Identifiable<K>> Map<K, T> getListOrMap(Class<K> clazz, T listElement) {
+ public static <K extends Key<T>,T extends KeyAware<K>> Map<K, T> getListOrMap(Class<K> clazz, T listElement) {
return getListOrMap(clazz, Arrays.asList(listElement) );
}
public static Uint32 getLongOrUint32(long longVal) {
diff --git a/sdnr/wt/data-provider/model/src/main/yang/data-provider@2020-11-10.yang b/sdnr/wt/data-provider/model/src/main/yang/data-provider.yang
index 0c89b675b..0c89b675b 100644
--- a/sdnr/wt/data-provider/model/src/main/yang/data-provider@2020-11-10.yang
+++ b/sdnr/wt/data-provider/model/src/main/yang/data-provider.yang