X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-binding-dom-it%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fmd%2Fsal%2Fbinding%2Fdata%2FWildcardedDataChangeListenerTest.java;h=ff6d02bb9abb93ce88c8165f1b4d69cea1c17fb2;hp=48872a865cb891c49fe625fafb1ce7fdf4b6b8ef;hb=70cd4b01dd47a66c5591e6f8151430bb9c274a09;hpb=8e4580f8989c7a40861be1c025822ebba4f1cb07 diff --git a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java index 48872a865c..ff6d02bb9a 100644 --- a/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java +++ b/opendaylight/md-sal/sal-binding-dom-it/src/test/java/org/opendaylight/controller/md/sal/binding/data/WildcardedDataChangeListenerTest.java @@ -20,6 +20,7 @@ import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.binding.test.AbstractDataTreeChangeListenerTest; +import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; 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.TreeComplexUsesAugmentBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.augment.rev140709.complex.from.grouping.ContainerWithUses; @@ -32,7 +33,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controll import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.md.sal.test.list.rev140701.two.level.list.TopLevelListKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.binding.YangModuleInfo; -import org.opendaylight.yangtools.yang.binding.util.BindingReflections; /** * FIXME: THis test should be moved to compat test-suite @@ -44,41 +44,40 @@ public class WildcardedDataChangeListenerTest extends AbstractDataTreeChangeList protected static final InstanceIdentifier DEEP_WILDCARDED_PATH = InstanceIdentifier .builder(Top.class) - .child(TopLevelList.class) // - .augmentation(TreeComplexUsesAugment.class) // - .child(ListViaUses.class) // + .child(TopLevelList.class) + .augmentation(TreeComplexUsesAugment.class) + .child(ListViaUses.class) .build(); private static final InstanceIdentifier NODE_0_TCU_PATH = InstanceIdentifier .builder(Top.class) - .child(TopLevelList.class, TOP_LEVEL_LIST_0_KEY) // - .augmentation(TreeComplexUsesAugment.class) // + .child(TopLevelList.class, TOP_LEVEL_LIST_0_KEY) + .augmentation(TreeComplexUsesAugment.class) .build(); private static final InstanceIdentifier NODE_1_TCU_PATH = InstanceIdentifier .builder(Top.class) - .child(TopLevelList.class, TOP_LEVEL_LIST_1_KEY) // - .augmentation(TreeComplexUsesAugment.class) // + .child(TopLevelList.class, TOP_LEVEL_LIST_1_KEY) + .augmentation(TreeComplexUsesAugment.class) .build(); private static final ListViaUsesKey LIST_VIA_USES_KEY = new ListViaUsesKey("test"); - private static final InstanceIdentifier NODE_0_LVU_PATH = NODE_0_TCU_PATH.child(ListViaUses.class, LIST_VIA_USES_KEY); + private static final InstanceIdentifier NODE_0_LVU_PATH = NODE_0_TCU_PATH.child(ListViaUses.class, + LIST_VIA_USES_KEY); - private static final InstanceIdentifier NODE_1_LVU_PATH = NODE_1_TCU_PATH.child(ListViaUses.class, LIST_VIA_USES_KEY); + private static final InstanceIdentifier NODE_1_LVU_PATH = NODE_1_TCU_PATH.child(ListViaUses.class, + LIST_VIA_USES_KEY); private static final InstanceIdentifier NODE_0_CWU_PATH = NODE_0_TCU_PATH.child(ContainerWithUses.class); - private static final ContainerWithUses CWU= new ContainerWithUsesBuilder()// - .setLeafFromGrouping("some container value") // - .build(); + private static final ContainerWithUses CWU = new ContainerWithUsesBuilder() + .setLeafFromGrouping("some container value").build(); - private static final ListViaUses LVU = new ListViaUsesBuilder() // - .setKey(LIST_VIA_USES_KEY) // - .setName("john") - .build(); + private static final ListViaUses LVU = new ListViaUsesBuilder() + .withKey(LIST_VIA_USES_KEY).setName("john").build(); @Override protected Iterable getModuleInfos() throws Exception {