From: Tom Pantelis Date: Mon, 25 Jun 2018 03:12:08 +0000 (-0400) Subject: Make AbstractDataBrokerTestCustomizer#getDomBroker public X-Git-Tag: release/fluorine~70 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=dd7117918da3f96e00d662c10f513e74ac371c47 Make AbstractDataBrokerTestCustomizer#getDomBroker public The DOMDataBroker is exposed via createDOMDataBroker however this creates a new instance so users don't actually get the DOMDataBroker instance that is backing the DataBroker. Therefore expose getDomBroker publicly. Change-Id: Id4b53935e4c17e4a9cd4538d669a9e05d97892af Signed-off-by: Tom Pantelis --- diff --git a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java index cbbfc12edb..408d8c1546 100644 --- a/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java +++ b/opendaylight/md-sal/sal-binding-broker/src/test/java/org/opendaylight/controller/md/sal/binding/test/AbstractBaseDataBrokerTest.java @@ -36,7 +36,7 @@ public abstract class AbstractBaseDataBrokerTest extends AbstractSchemaAwareTest protected void setupWithSchema(final SchemaContext context) { testCustomizer = createDataBrokerTestCustomizer(); dataBroker = testCustomizer.createDataBroker(); - domBroker = testCustomizer.createDOMDataBroker(); + domBroker = testCustomizer.getDOMDataBroker(); testCustomizer.updateSchema(context); } 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 784fea804b..f36b685435 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 @@ -102,7 +102,7 @@ public abstract class AbstractDataBrokerTestCustomizer { return this.schemaService; } - private DOMDataBroker getDOMDataBroker() { + public DOMDataBroker getDOMDataBroker() { if (this.domDataBroker == null) { this.domDataBroker = createDOMDataBroker(); }