From 58cc305ac41b7edd861611c95cf3a5faa48a7495 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Wed, 21 Jun 2023 20:42:39 +0200 Subject: [PATCH] Adjust to yang.binding.{Identifier,Identifiable} rename We hare renamed classes here, adjust to those changes. Change-Id: I5efe2eeeb2878dfac864bc6ebc3e08c98ace253a Signed-off-by: Robert Varga --- .../controller/blueprint/ext/BindingContext.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java index cfa0228747..86d7c45379 100644 --- a/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java +++ b/opendaylight/blueprint/src/main/java/org/opendaylight/controller/blueprint/ext/BindingContext.java @@ -19,9 +19,9 @@ import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMSource; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.Identifiable; -import org.opendaylight.yangtools.yang.binding.Identifier; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.opendaylight.yangtools.yang.binding.Key; +import org.opendaylight.yangtools.yang.binding.KeyAware; import org.opendaylight.yangtools.yang.binding.contract.Naming; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.schema.MapNode; @@ -49,7 +49,7 @@ import org.xml.sax.SAXException; public abstract class BindingContext { public static BindingContext create(final String logName, final Class klass, final String appConfigListKeyValue) { - if (Identifiable.class.isAssignableFrom(klass)) { + if (KeyAware.class.isAssignableFrom(klass)) { // The binding class corresponds to a yang list. if (Strings.isNullOrEmpty(appConfigListKeyValue)) { throw new ComponentDefinitionException(String.format( @@ -133,7 +133,7 @@ public abstract class BindingContext { final String listKeyValue) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException { // We assume the yang list key type is string. - Identifier keyInstance = (Identifier) bindingClass.getMethod(Naming.IDENTIFIABLE_KEY_NAME) + Key keyInstance = (Key) bindingClass.getMethod(Naming.KEY_AWARE_KEY_NAME) .getReturnType().getConstructor(String.class).newInstance(listKeyValue); InstanceIdentifier appConfigPath = InstanceIdentifier.builder((Class)bindingClass, keyInstance).build(); return new ListBindingContext(bindingClass, appConfigPath, listKeyValue); -- 2.36.6