From: Robert Varga Date: Tue, 30 Apr 2019 10:55:09 +0000 (+0200) Subject: Bump mdsal to 4.0.1 X-Git-Tag: release/sodium~85 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=698468cfa4cdc7d5ff7dfe0639058fea3e5d7d5b Bump mdsal to 4.0.1 Upgrade mdsal to 4.0.1 and remove most references to Javassist and its associated streamer implementation. Change-Id: Ia9dc2c886217f1c353db6523b654e993ed9a397a Signed-off-by: Robert Varga --- diff --git a/benchmark/api/pom.xml b/benchmark/api/pom.xml index 6784395c0c..1531bb5336 100644 --- a/benchmark/api/pom.xml +++ b/benchmark/api/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/benchmark/dsbenchmark/pom.xml b/benchmark/dsbenchmark/pom.xml index 949fe5d9a3..a476bc13ad 100644 --- a/benchmark/dsbenchmark/pom.xml +++ b/benchmark/dsbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/benchmark/ntfbenchmark/pom.xml b/benchmark/ntfbenchmark/pom.xml index ae7f68fdd4..a60a12302c 100644 --- a/benchmark/ntfbenchmark/pom.xml +++ b/benchmark/ntfbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/benchmark/rpcbenchmark/pom.xml b/benchmark/rpcbenchmark/pom.xml index 73b022b9ca..a71c0ccc61 100644 --- a/benchmark/rpcbenchmark/pom.xml +++ b/benchmark/rpcbenchmark/pom.xml @@ -12,7 +12,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/features/benchmark/odl-benchmark-api/pom.xml b/features/benchmark/odl-benchmark-api/pom.xml index f45a43509a..d9b4584fe5 100644 --- a/features/benchmark/odl-benchmark-api/pom.xml +++ b/features/benchmark/odl-benchmark-api/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal odl-mdsal-binding-base - 4.0.0 + 4.0.1 xml features diff --git a/features/mdsal/odl-clustering-test-app/pom.xml b/features/mdsal/odl-clustering-test-app/pom.xml index 9ab9176b8f..613c96dd4d 100644 --- a/features/mdsal/odl-clustering-test-app/pom.xml +++ b/features/mdsal/odl-clustering-test-app/pom.xml @@ -26,7 +26,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 import pom diff --git a/features/mdsal/odl-controller-binding-api/pom.xml b/features/mdsal/odl-controller-binding-api/pom.xml index d6f464720c..b0f68d3428 100644 --- a/features/mdsal/odl-controller-binding-api/pom.xml +++ b/features/mdsal/odl-controller-binding-api/pom.xml @@ -29,7 +29,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-controller-dom-api/pom.xml b/features/mdsal/odl-controller-dom-api/pom.xml index 2f5b95d252..73325fdcb7 100644 --- a/features/mdsal/odl-controller-dom-api/pom.xml +++ b/features/mdsal/odl-controller-dom-api/pom.xml @@ -29,7 +29,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-controller-mdsal-common/pom.xml b/features/mdsal/odl-controller-mdsal-common/pom.xml index 45fa286f03..042951440d 100644 --- a/features/mdsal/odl-controller-mdsal-common/pom.xml +++ b/features/mdsal/odl-controller-mdsal-common/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-controller-model-topology/pom.xml b/features/mdsal/odl-controller-model-topology/pom.xml index a01e5dd0ef..74061d5243 100644 --- a/features/mdsal/odl-controller-model-topology/pom.xml +++ b/features/mdsal/odl-controller-model-topology/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml index 5a67be4809..f2974eb3bf 100644 --- a/features/mdsal/odl-mdsal-broker-local/pom.xml +++ b/features/mdsal/odl-mdsal-broker-local/pom.xml @@ -44,7 +44,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-mdsal-broker/pom.xml b/features/mdsal/odl-mdsal-broker/pom.xml index a61bf0b42d..665023d340 100644 --- a/features/mdsal/odl-mdsal-broker/pom.xml +++ b/features/mdsal/odl-mdsal-broker/pom.xml @@ -29,7 +29,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml index 435f68a52e..33796a9d90 100644 --- a/features/mdsal/odl-mdsal-distributed-datastore/pom.xml +++ b/features/mdsal/odl-mdsal-distributed-datastore/pom.xml @@ -36,7 +36,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml index 8da663793e..3fb7d3f439 100644 --- a/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml +++ b/features/mdsal/odl-mdsal-distributed-datastore/src/main/feature/feature.xml @@ -12,6 +12,7 @@ odl-yangtools-codec odl-mdsal-eos-dom odl-mdsal-dom-broker + odl-mdsal-binding-dom-adapter mvn:org.opendaylight.controller/sal-clustering-config/${project.version}/xml/akkaconf diff --git a/features/mdsal/odl-mdsal-model-inventory/pom.xml b/features/mdsal/odl-mdsal-model-inventory/pom.xml index bf2b0a2600..b41a8761a0 100644 --- a/features/mdsal/odl-mdsal-model-inventory/pom.xml +++ b/features/mdsal/odl-mdsal-model-inventory/pom.xml @@ -28,7 +28,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-message-bus-collector/pom.xml b/features/mdsal/odl-message-bus-collector/pom.xml index aaeb7f164f..454f775b96 100644 --- a/features/mdsal/odl-message-bus-collector/pom.xml +++ b/features/mdsal/odl-message-bus-collector/pom.xml @@ -37,7 +37,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/features/mdsal/odl-toaster/pom.xml b/features/mdsal/odl-toaster/pom.xml index 140401886c..171409a7c0 100644 --- a/features/mdsal/odl-toaster/pom.xml +++ b/features/mdsal/odl-toaster/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal odl-mdsal-binding-runtime - 4.0.0 + 4.0.1 xml features diff --git a/karaf/pom.xml b/karaf/pom.xml index b84a0473d6..ca528e52a6 100644 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -55,7 +55,7 @@ org.opendaylight.mdsal features-mdsal - 4.0.0 + 4.0.1 features xml runtime diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml index b8393372a0..3d00d77c6b 100644 --- a/opendaylight/blueprint/pom.xml +++ b/opendaylight/blueprint/pom.xml @@ -27,7 +27,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml index e7794a2257..e45a19da44 100644 --- a/opendaylight/config/pom.xml +++ b/opendaylight/config/pom.xml @@ -5,7 +5,7 @@ org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/opendaylight/md-sal/parent/pom.xml b/opendaylight/md-sal/parent/pom.xml index 71d28dd92e..019218928a 100644 --- a/opendaylight/md-sal/parent/pom.xml +++ b/opendaylight/md-sal/parent/pom.xml @@ -11,7 +11,7 @@ org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingBrokerWiring.java b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingBrokerWiring.java index 782a018c5c..916077da44 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingBrokerWiring.java +++ b/opendaylight/md-sal/sal-binding-broker/src/main/java/org/opendaylight/controller/md/sal/binding/impl/BindingBrokerWiring.java @@ -7,7 +7,6 @@ */ package org.opendaylight.controller.md.sal.binding.impl; -import javassist.ClassPool; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.MountPointService; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; @@ -24,10 +23,8 @@ import org.opendaylight.controller.md.sal.dom.api.DOMRpcService; import org.opendaylight.controller.md.sal.dom.spi.DOMNotificationSubscriptionListenerRegistry; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -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.api.ClassLoadingStrategy; -import org.opendaylight.mdsal.binding.generator.util.JavassistUtils; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; @@ -44,8 +41,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContextListener; */ public class BindingBrokerWiring implements AutoCloseable { - private static final JavassistUtils JAVASSIST = JavassistUtils.forClassPool(ClassPool.getDefault()); - private final BindingToNormalizedNodeCodec bindingToNormalizedNodeCodec; private final ListenerRegistration mappingCodecListenerReg; private final RpcProviderRegistry rpcProviderRegistry; @@ -64,8 +59,7 @@ public class BindingBrokerWiring implements AutoCloseable { DOMNotificationSubscriptionListenerRegistry domNotificationListenerRegistry, DOMDataBroker domDataBroker, DOMDataBroker domPingPongDataBroker) { // Runtime binding/normalized mapping service - BindingNormalizedNodeCodecRegistry codecRegistry - = new BindingNormalizedNodeCodecRegistry(StreamWriterGenerator.create(JAVASSIST)); + BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(); bindingToNormalizedNodeCodec = new BindingToNormalizedNodeCodec(classLoadingStrategy, codecRegistry, true); // Register the BindingToNormalizedNodeCodec with the SchemaService as a SchemaContextListener diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java index a72eba5d83..85d36210e3 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/impl/BindingNormalizedCodecTest.java @@ -5,7 +5,6 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.controller.md.sal.binding.impl; import static org.junit.Assert.assertEquals; @@ -25,14 +24,10 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import javassist.ClassPool; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.test.AbstractSchemaAwareTest; -import org.opendaylight.mdsal.binding.dom.codec.gen.impl.DataObjectSerializerGenerator; -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.GeneratedClassLoadingStrategy; -import org.opendaylight.mdsal.binding.generator.util.JavassistUtils; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeComplexUsesAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.TreeLeafOnlyAugment; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.bi.ba.rpcservice.rev140701.OpendaylightTestRpcServiceService; @@ -72,9 +67,7 @@ public class BindingNormalizedCodecTest extends AbstractSchemaAwareTest { @Override protected void setupWithSchema(final SchemaContext schemaContext) { this.context = schemaContext; - final DataObjectSerializerGenerator streamWriter = StreamWriterGenerator - .create(JavassistUtils.forClassPool(ClassPool.getDefault())); - final BindingNormalizedNodeCodecRegistry registry = new BindingNormalizedNodeCodecRegistry(streamWriter); + final BindingNormalizedNodeCodecRegistry registry = new BindingNormalizedNodeCodecRegistry(); this.codec = new BindingToNormalizedNodeCodec(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(), registry, true); } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTestCustomizer.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTestCustomizer.java index 722bbd28d0..2830510fbd 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTestCustomizer.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractDataBrokerTestCustomizer.java @@ -10,7 +10,6 @@ package org.opendaylight.controller.md.sal.binding.test; import com.google.common.collect.ImmutableMap; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; -import javassist.ClassPool; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; import org.opendaylight.controller.md.sal.binding.api.NotificationService; @@ -25,11 +24,8 @@ import org.opendaylight.controller.md.sal.dom.broker.impl.SerializedDOMDataBroke import org.opendaylight.controller.md.sal.dom.store.impl.InMemoryDOMDataStore; import org.opendaylight.controller.sal.binding.test.util.MockSchemaService; import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.mdsal.binding.dom.codec.gen.impl.DataObjectSerializerGenerator; -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.GeneratedClassLoadingStrategy; -import org.opendaylight.mdsal.binding.generator.util.JavassistUtils; import org.opendaylight.mdsal.dom.api.DOMSchemaService; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -50,9 +46,7 @@ public abstract class AbstractDataBrokerTestCustomizer { public AbstractDataBrokerTestCustomizer() { this.schemaService = new MockSchemaService(); - final ClassPool pool = ClassPool.getDefault(); - final DataObjectSerializerGenerator generator = StreamWriterGenerator.create(JavassistUtils.forClassPool(pool)); - final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator); + final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(); final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(); this.bindingToNormalized = new BindingToNormalizedNodeCodec(loading, codecRegistry); this.schemaService.registerSchemaContextListener(this.bindingToNormalized); diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java index 16c065bd02..145a59a71d 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingBrokerTestFactory.java @@ -39,13 +39,13 @@ public class BindingBrokerTestFactory { this.executor = executor; } - public BindingTestContext getTestContext() { Preconditions.checkState(executor != null, "Executor is not set."); ListeningExecutorService listenableExecutor = MoreExecutors.listeningDecorator(executor); - return new BindingTestContext(listenableExecutor, getClassPool(),startWithParsedSchema); + return new BindingTestContext(listenableExecutor, startWithParsedSchema); } + @Deprecated public ClassPool getClassPool() { if (classPool == null) { return CLASS_POOL; @@ -54,6 +54,7 @@ public class BindingBrokerTestFactory { return classPool; } + @Deprecated public void setClassPool(final ClassPool classPool) { this.classPool = classPool; } diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java index 8f4794ed8f..5227f30e3c 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/sal/binding/test/util/BindingTestContext.java @@ -44,12 +44,9 @@ import org.opendaylight.controller.sal.binding.api.RpcConsumerRegistry; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.controller.sal.binding.impl.RootBindingAwareBroker; import org.opendaylight.controller.sal.core.spi.data.DOMStore; -import org.opendaylight.mdsal.binding.dom.codec.gen.impl.DataObjectSerializerGenerator; -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.GeneratedClassLoadingStrategy; import org.opendaylight.mdsal.binding.generator.impl.ModuleInfoBackedContext; -import org.opendaylight.mdsal.binding.generator.util.JavassistUtils; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; import org.opendaylight.yangtools.yang.model.api.SchemaContext; @@ -64,7 +61,6 @@ public class BindingTestContext implements AutoCloseable { private final ListeningExecutorService executor; - private final ClassPool classPool; private final boolean startWithSchema; @@ -102,13 +98,18 @@ public class BindingTestContext implements AutoCloseable { return this.codec; } - protected BindingTestContext(final ListeningExecutorService executor, final ClassPool classPool, - final boolean startWithSchema) { + + protected BindingTestContext(final ListeningExecutorService executor, final boolean startWithSchema) { this.executor = executor; - this.classPool = classPool; this.startWithSchema = startWithSchema; } + @Deprecated + protected BindingTestContext(final ListeningExecutorService executor, final ClassPool classPool, + final boolean startWithSchema) { + this(executor, startWithSchema); + } + public void startDomDataBroker() { } @@ -160,11 +161,7 @@ public class BindingTestContext implements AutoCloseable { } public void startBindingToDomMappingService() { - checkState(this.classPool != null, "ClassPool needs to be present"); - - final DataObjectSerializerGenerator generator = StreamWriterGenerator.create( - JavassistUtils.forClassPool(this.classPool)); - final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(generator); + final BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry(); final GeneratedClassLoadingStrategy loading = GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy(); this.codec = new BindingToNormalizedNodeCodec(loading, codecRegistry); this.mockSchemaService.registerSchemaContextListener(this.codec); diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml index 9ef18c4c09..115dd1eaab 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml +++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml @@ -25,7 +25,7 @@ org.opendaylight.mdsal mdsal-artifacts - 4.0.0 + 4.0.1 pom import diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorFactory.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorFactory.java index 1b7c0281a6..8d6f4816a3 100644 --- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorFactory.java +++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/DatastoreContextIntrospectorFactory.java @@ -8,13 +8,10 @@ package org.opendaylight.controller.cluster.datastore; import com.google.common.annotations.VisibleForTesting; -import javassist.ClassPool; import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer; -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.api.ClassLoadingStrategy; 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.DOMSchemaService; @@ -45,9 +42,7 @@ public class DatastoreContextIntrospectorFactory { private BindingNormalizedNodeSerializer newBindingSerializer() { BindingNormalizedNodeCodecRegistry codecRegistry = new BindingNormalizedNodeCodecRegistry( - StreamWriterGenerator.create(JavassistUtils.forClassPool(ClassPool.getDefault()))); - codecRegistry.onBindingRuntimeContextUpdated(BindingRuntimeContext.create(classLoadingStrategy, - schemaService.getGlobalContext())); + BindingRuntimeContext.create(classLoadingStrategy, schemaService.getGlobalContext())); return codecRegistry; } } diff --git a/opendaylight/model/model-inventory/pom.xml b/opendaylight/model/model-inventory/pom.xml index 680a9bfa47..6f5d305a4a 100644 --- a/opendaylight/model/model-inventory/pom.xml +++ b/opendaylight/model/model-inventory/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1 diff --git a/opendaylight/model/model-topology/pom.xml b/opendaylight/model/model-topology/pom.xml index e7548a6a16..4d2d6ca904 100644 --- a/opendaylight/model/model-topology/pom.xml +++ b/opendaylight/model/model-topology/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.mdsal binding-parent - 4.0.0 + 4.0.1