From e37116b4f5f1f29f78cee2a09242d05855c7139e Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 30 Apr 2019 13:52:18 +0200 Subject: [PATCH] Bump mdsal to 4.0.1 This bumps mdsal to 4.0.1. Change-Id: I42366367b001b64d2ae23b88992fcdebcaa881d3 Signed-off-by: Robert Varga --- features/netconf-connector/odl-netconf-connector/pom.xml | 2 +- features/netconf/odl-netconf-api/pom.xml | 2 +- features/netconf/odl-netconf-notifications-impl/pom.xml | 2 +- features/restconf/odl-restconf-common/pom.xml | 2 +- features/restconf/odl-restconf-nb-bierman02/pom.xml | 2 +- .../notification/impl/ops/NotificationsTransformUtil.java | 7 +------ .../eventsources/netconf/NetconfEventSourceMount.java | 7 +------ netconf/netconf-parent/pom.xml | 2 +- restconf/restconf-parent/pom.xml | 2 +- 9 files changed, 9 insertions(+), 19 deletions(-) diff --git a/features/netconf-connector/odl-netconf-connector/pom.xml b/features/netconf-connector/odl-netconf-connector/pom.xml index e441e36477..202213e6c2 100644 --- a/features/netconf-connector/odl-netconf-connector/pom.xml +++ b/features/netconf-connector/odl-netconf-connector/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml index 7da5eb94ad..9bd9d72cda 100644 --- a/features/netconf/odl-netconf-api/pom.xml +++ b/features/netconf/odl-netconf-api/pom.xml @@ -35,7 +35,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/netconf/odl-netconf-notifications-impl/pom.xml b/features/netconf/odl-netconf-notifications-impl/pom.xml index 53d78d022c..88622d9347 100644 --- a/features/netconf/odl-netconf-notifications-impl/pom.xml +++ b/features/netconf/odl-netconf-notifications-impl/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml index c5d989245a..b336f44a98 100644 --- a/features/restconf/odl-restconf-common/pom.xml +++ b/features/restconf/odl-restconf-common/pom.xml @@ -35,7 +35,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/restconf/odl-restconf-nb-bierman02/pom.xml b/features/restconf/odl-restconf-nb-bierman02/pom.xml index 31272e661f..6e2c338e98 100644 --- a/features/restconf/odl-restconf-nb-bierman02/pom.xml +++ b/features/restconf/odl-restconf-nb-bierman02/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtil.java b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtil.java index 24c669e868..c146200e99 100644 --- a/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtil.java +++ b/netconf/mdsal-netconf-notification/src/main/java/org/opendaylight/netconf/mdsal/notification/impl/ops/NotificationsTransformUtil.java @@ -15,14 +15,11 @@ import java.io.IOException; import java.util.Collections; import java.util.Date; import java.util.Optional; -import javassist.ClassPool; import javax.xml.stream.XMLStreamException; import javax.xml.transform.dom.DOMResult; -import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator; import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext; -import org.opendaylight.mdsal.binding.generator.util.JavassistUtils; import org.opendaylight.netconf.api.xml.XmlUtil; import org.opendaylight.netconf.notifications.NetconfNotification; import org.opendaylight.netconf.util.NetconfUtil; @@ -52,9 +49,7 @@ public final class NotificationsTransformUtil { Preconditions.checkNotNull(CREATE_SUBSCRIPTION_RPC); - final JavassistUtils javassist = JavassistUtils.forClassPool(ClassPool.getDefault()); - CODEC_REGISTRY = new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(javassist)); - CODEC_REGISTRY.onBindingRuntimeContextUpdated(BindingRuntimeContext.create(moduleInfoBackedContext, + CODEC_REGISTRY = new BindingNormalizedNodeCodecRegistry(BindingRuntimeContext.create(moduleInfoBackedContext, NOTIFICATIONS_SCHEMA_CTX)); } diff --git a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java index b5f9801722..f49ddd9b74 100644 --- a/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java +++ b/netconf/messagebus-netconf/src/main/java/org/opendaylight/netconf/messagebus/eventsources/netconf/NetconfEventSourceMount.java @@ -18,12 +18,9 @@ import java.util.Collections; import java.util.List; import java.util.Optional; import java.util.concurrent.ExecutionException; -import javassist.ClassPool; -import org.opendaylight.mdsal.binding.dom.codec.gen.impl.StreamWriterGenerator; import org.opendaylight.mdsal.binding.dom.codec.impl.BindingNormalizedNodeCodecRegistry; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext; -import org.opendaylight.mdsal.binding.generator.util.JavassistUtils; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.mdsal.dom.api.DOMDataBroker; import org.opendaylight.mdsal.dom.api.DOMDataTreeReadTransaction; @@ -65,9 +62,7 @@ class NetconfEventSourceMount { .xml.ns.netmod.notification.rev080714.$YangModuleInfoImpl.getInstance())); SchemaContext notificationsSchemaCtx = moduleInfoBackedContext.tryToCreateSchemaContext().get(); - final JavassistUtils javassist = JavassistUtils.forClassPool(ClassPool.getDefault()); - CODEC_REGISTRY = new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(javassist)); - CODEC_REGISTRY.onBindingRuntimeContextUpdated(BindingRuntimeContext.create(moduleInfoBackedContext, + CODEC_REGISTRY = new BindingNormalizedNodeCodecRegistry(BindingRuntimeContext.create(moduleInfoBackedContext, notificationsSchemaCtx)); } diff --git a/netconf/netconf-parent/pom.xml b/netconf/netconf-parent/pom.xml index 9c051a43f8..c569b4e209 100644 --- a/netconf/netconf-parent/pom.xml +++ b/netconf/netconf-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/restconf/restconf-parent/pom.xml b/restconf/restconf-parent/pom.xml index 71d9ed32e5..06e896dd6a 100644 --- a/restconf/restconf-parent/pom.xml +++ b/restconf/restconf-parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 -- 2.36.6