From a90863760d1ae1a92520ce29841aec600d25a83a Mon Sep 17 00:00:00 2001 From: Jan Srnicek Date: Fri, 30 Jun 2017 15:10:27 +0200 Subject: HONEYCOMB-358 - Conditional module loading Change-Id: Ic9b7182cc77bf2f73cf5edd3ee19f25f53711cda Signed-off-by: Jan Srnicek --- .../infra/distro/schema/ModuleInfoBackedCtxProvider.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java') diff --git a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java index f82cdd0b1..e2d0fbfaa 100644 --- a/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java +++ b/infra/minimal-distribution/src/main/java/io/fd/honeycomb/infra/distro/schema/ModuleInfoBackedCtxProvider.java @@ -16,11 +16,11 @@ package io.fd.honeycomb.infra.distro.schema; +import static io.fd.honeycomb.infra.distro.schema.YangModulesProvider.YangModules; + import com.google.common.base.MoreObjects; import com.google.inject.Inject; import io.fd.honeycomb.infra.distro.ProviderTrait; -import java.util.HashSet; -import java.util.Set; import java.util.stream.Collectors; import org.opendaylight.yangtools.sal.binding.generator.impl.ModuleInfoBackedContext; import org.opendaylight.yangtools.yang.binding.YangModelBindingProvider; @@ -30,13 +30,14 @@ import org.slf4j.LoggerFactory; public final class ModuleInfoBackedCtxProvider extends ProviderTrait { private static final Logger LOG = LoggerFactory.getLogger(ModuleInfoBackedCtxProvider.class); - @Inject(optional = true) - private Set moduleInfos = new HashSet<>(); + // optional in sense that list of modules inside can be empty if none was found + @Inject + private YangModules moduleInfos; @Override protected ModuleInfoBackedContext create() { ModuleInfoBackedContext create = ModuleInfoBackedContext.create(); - create.addModuleInfos(moduleInfos.stream() + create.addModuleInfos(moduleInfos.getYangBindings().stream() .map(YangModelBindingProvider::getModuleInfo) .collect(Collectors.toList())); LOG.debug("ModuleInfoBackedContext created from {}", moduleInfos); -- cgit 1.2.3-korg