X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=binding%2Fmdsal-binding-runtime-spi%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fmdsal%2Fbinding%2Fruntime%2Fspi%2FModuleInfoSnapshotResolver.java;h=ab655c878286b1d785a09d6989594e6db370dcbe;hb=5f8a373c07549a901b70595067dd11c161d0c4e4;hp=458a7bc141e70afa095acfb118180c701627267f;hpb=aa629fb8d217a4d42a92aa8e78d7ae679f797346;p=mdsal.git diff --git a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java index 458a7bc141..ab655c8782 100644 --- a/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java +++ b/binding/mdsal-binding-runtime-spi/src/main/java/org/opendaylight/mdsal/binding/runtime/spi/ModuleInfoSnapshotResolver.java @@ -29,9 +29,8 @@ import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; import org.opendaylight.mdsal.binding.runtime.api.ModuleInfoSnapshot; import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections; -import org.opendaylight.yangtools.concepts.AbstractObjectRegistration; +import org.opendaylight.yangtools.concepts.AbstractRegistration; import org.opendaylight.yangtools.concepts.Mutable; -import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.concepts.Registration; import org.opendaylight.yangtools.yang.binding.DataRoot; import org.opendaylight.yangtools.yang.binding.YangFeature; @@ -113,9 +112,8 @@ public final class ModuleInfoSnapshotResolver implements Mutable { return ctxResolver.registerSupportedFeatures(BindingReflections.getQNameModule(module), features); } - public synchronized List> registerModuleInfos( - final Iterable moduleInfos) { - final var ret = new ArrayList>(); + public synchronized List registerModuleInfos(final Iterable moduleInfos) { + final var ret = new ArrayList(); for (var moduleInfo : moduleInfos) { ret.add(register(requireNonNull(moduleInfo))); } @@ -123,12 +121,12 @@ public final class ModuleInfoSnapshotResolver implements Mutable { } @Holding("this") - private ObjectRegistration register(final @NonNull YangModuleInfo moduleInfo) { + private Registration register(final @NonNull YangModuleInfo moduleInfo) { final var regInfos = flatDependencies(moduleInfo).stream() .map(this::registerModuleInfo) .collect(ImmutableList.toImmutableList()); - return new AbstractObjectRegistration<>(moduleInfo) { + return new AbstractRegistration() { @Override protected void removeRegistration() { unregister(regInfos);