X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Fosgi%2FYangStoreSnapshotImpl.java;h=827708f31ceb52fbc39bd8c202fa630cf698d225;hp=782998067f80d5fc35a1249dedbaa8e0dcf4e37b;hb=d5702150e612565cd091f184064f017bc4cc3971;hpb=e27d63bdcfbfb0c1078a9c3e5aabf59ae7e2315f;ds=sidebyside diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreSnapshotImpl.java b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreSnapshotImpl.java index 782998067f..827708f31c 100644 --- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreSnapshotImpl.java +++ b/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/osgi/YangStoreSnapshotImpl.java @@ -9,6 +9,13 @@ package org.opendaylight.controller.netconf.confignetconfconnector.osgi; import com.google.common.collect.Maps; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + import org.opendaylight.controller.config.yangjmxgenerator.ModuleMXBeanEntry; import org.opendaylight.controller.config.yangjmxgenerator.PackageTranslator; import org.opendaylight.controller.config.yangjmxgenerator.ServiceInterfaceEntry; @@ -21,18 +28,12 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - public class YangStoreSnapshotImpl implements YangStoreSnapshot { private static final Logger logger = LoggerFactory.getLogger(YangStoreSnapshotImpl.class); private final Map> moduleMXBeanEntryMap; + Map> moduleMXBeanEntryMap; private final Map> qNamesToIdentitiesToModuleMXBeanEntries; @@ -40,7 +41,7 @@ public class YangStoreSnapshotImpl implements YangStoreSnapshot { private final SchemaContext schemaContext; - public YangStoreSnapshotImpl(SchemaContext resolveSchemaContext) { + public YangStoreSnapshotImpl(final SchemaContext resolveSchemaContext) { logger.trace("Resolved modules:{}", resolveSchemaContext.getModules()); this.schemaContext = resolveSchemaContext; // JMX generator @@ -60,7 +61,7 @@ public class YangStoreSnapshotImpl implements YangStoreSnapshot { qNamesToSIEs.put(sieEntry.getKey(), sieEntry.getValue()); } else { throw new IllegalStateException("Cannot add two SIE with same qname " - + sieEntry.getValue()); + + sieEntry.getValue()); } } } @@ -75,7 +76,7 @@ public class YangStoreSnapshotImpl implements YangStoreSnapshot { TypeProviderWrapper typeProviderWrapper = new TypeProviderWrapper( new TypeProviderImpl(resolveSchemaContext)); - QName qName = new QName(module.getNamespace(), module.getRevision(), module.getName()); + QName qName = QName.create(module.getNamespace(), module.getRevision(), module.getName()); Map namesToMBEs = Collections.unmodifiableMap(ModuleMXBeanEntry.create(module, qNamesToSIEs, resolveSchemaContext, @@ -105,7 +106,7 @@ public class YangStoreSnapshotImpl implements YangStoreSnapshot { } @Override - public String getModuleSource(org.opendaylight.yangtools.yang.model.api.ModuleIdentifier moduleIdentifier) { + public String getModuleSource(final org.opendaylight.yangtools.yang.model.api.ModuleIdentifier moduleIdentifier) { return schemaContext.getModuleSource(moduleIdentifier).get(); }