package org.opendaylight.yangtools.yang.model.util;
-import com.google.common.base.Function;
import com.google.common.base.Preconditions;
-import com.google.common.base.Predicate;
import com.google.common.base.Strings;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableMap;
import java.net.URI;
import java.util.Collection;
import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeMap;
-import javax.annotation.Nullable;
+import java.util.function.Function;
import javax.annotation.concurrent.Immutable;
import org.opendaylight.yangtools.yang.model.api.Module;
import org.opendaylight.yangtools.yang.model.api.ModuleIdentifier;
private final SetMultimap<String, Module> nameToModules;
/**
- * Filters SchemaContext for yang modules
+ * Filters SchemaContext for yang modules.
*
* @param delegate original SchemaContext
- * @param rootModules modules (yang schemas) to be available and all their dependencies (modules importing rootModule and whole chain of their imports)
+ * @param rootModules modules (yang schemas) to be available and all their dependencies (modules importing
+ * rootModule and whole chain of their imports)
* @param additionalModuleIds (additional) modules (yang schemas) to be available and whole chain of their imports
- *
*/
- public FilteringSchemaContextProxy(final SchemaContext delegate, final Collection<ModuleId> rootModules, final Set<ModuleId> additionalModuleIds) {
-
- Preconditions.checkArgument(rootModules!=null,"Base modules cannot be null.");
- Preconditions.checkArgument(additionalModuleIds!=null,"Additional modules cannot be null.");
+ public FilteringSchemaContextProxy(final SchemaContext delegate, final Collection<ModuleId> rootModules,
+ final Set<ModuleId> additionalModuleIds) {
+ Preconditions.checkNotNull(rootModules, "Base modules cannot be null.");
+ Preconditions.checkNotNull(additionalModuleIds, "Additional modules cannot be null.");
final Builder<Module> filteredModulesBuilder = new Builder<>();
-
- final SetMultimap<URI, Module> nsMap = Multimaps.newSetMultimap(new TreeMap<URI, Collection<Module>>(), MODULE_SET_SUPPLIER);
- final SetMultimap<String, Module> nameMap = Multimaps.newSetMultimap(new TreeMap<String, Collection<Module>>(), MODULE_SET_SUPPLIER);
+ final SetMultimap<URI, Module> nsMap = Multimaps.newSetMultimap(new TreeMap<>(), MODULE_SET_SUPPLIER);
+ final SetMultimap<String, Module> nameMap = Multimaps.newSetMultimap(new TreeMap<>(), MODULE_SET_SUPPLIER);
ImmutableMap.Builder<ModuleIdentifier, String> identifiersToSourcesBuilder = ImmutableMap.builder();
processForAdditionalModules(delegate, additionalModuleIds, filteredModulesBuilder);
filteredModulesBuilder.addAll(getImportedModules(
- Maps.uniqueIndex(delegate.getModules(), ModuleId.MODULE_TO_MODULE_ID), filteredModulesBuilder.build(), nameToModulesAll));
+ Maps.uniqueIndex(delegate.getModules(), ModuleId.MODULE_TO_MODULE_ID::apply),
+ filteredModulesBuilder.build(), nameToModulesAll));
/**
* Instead of doing this on each invocation of getModules(), pre-compute
}
private static TreeMultimap<String, Module> getStringModuleTreeMultimap() {
- return TreeMultimap.create(new Comparator<String>() {
- @Override
- public int compare(final String o1, final String o2) {
- return o1.compareTo(o2);
- }
- }, REVISION_COMPARATOR);
+ return TreeMultimap.create(String::compareTo, REVISION_COMPARATOR);
}
private static void processForAdditionalModules(final SchemaContext delegate,
final Set<ModuleId> additionalModuleIds, final Builder<Module> filteredModulesBuilder) {
- filteredModulesBuilder.addAll(Collections2.filter(delegate.getModules(), new Predicate<Module>() {
- @Override
- public boolean apply(@Nullable final Module module) {
- return selectAdditionalModules(module, additionalModuleIds);
- }
- }));
+ filteredModulesBuilder.addAll(Collections2.filter(delegate.getModules(),
+ module -> selectAdditionalModules(module, additionalModuleIds)));
}
- private void processForRootModules(final SchemaContext delegate, final Collection<ModuleId> rootModules, final Builder<Module> filteredModulesBuilder) {
- filteredModulesBuilder.addAll(Collections2.filter(delegate.getModules(), new Predicate<Module>() {
- @Override
- public boolean apply(@Nullable final Module module) {
- return checkModuleDependency(module, rootModules);
- }
- }));
+ private void processForRootModules(final SchemaContext delegate, final Collection<ModuleId> rootModules,
+ final Builder<Module> filteredModulesBuilder) {
+ filteredModulesBuilder.addAll(Collections2.filter(delegate.getModules(),
+ module -> checkModuleDependency(module, rootModules)));
}
private static Multimap<String, Module> getStringModuleMap(final SchemaContext delegate) {
- return Multimaps.index(delegate.getModules(), new Function<Module, String>() {
- @Override
- public String apply(final Module input) {
- return input.getName();
- }
- });
+ return Multimaps.index(delegate.getModules(), Module::getName);
}
//dealing with imported module other than root and directly importing root
- private static Collection<Module> getImportedModules(final Map<ModuleId, Module> allModules, final Set<Module> baseModules, final TreeMultimap<String, Module> nameToModulesAll) {
+ private static Collection<Module> getImportedModules(final Map<ModuleId, Module> allModules,
+ final Set<Module> baseModules, final TreeMultimap<String, Module> nameToModulesAll) {
List<Module> relatedModules = Lists.newLinkedList();
for (Module module : baseModules) {
for (ModuleImport moduleImport : module.getImports()) {
- Date revisionDate = moduleImport.getRevision() == null ?
- nameToModulesAll.get(moduleImport.getModuleName()).first().getRevision() : moduleImport.getRevision();
+ Date revisionDate = moduleImport.getRevision() == null
+ ? nameToModulesAll.get(moduleImport.getModuleName()).first().getRevision()
+ : moduleImport.getRevision();
ModuleId key = new ModuleId(moduleImport.getModuleName(),revisionDate);
Module importedModule = allModules.get(key);
- Preconditions.checkArgument(importedModule != null, "Invalid schema, cannot find imported module: %s from module: %s, %s, modules:%s", key, module.getQNameModule(), module.getName() );
+ Preconditions.checkArgument(importedModule != null,
+ "Invalid schema, cannot find imported module: %s from module: %s, %s, modules:%s", key,
+ module.getQNameModule(), module.getName());
relatedModules.add(importedModule);
//calling imports recursive
- relatedModules.addAll(getImportedModules(allModules, Collections.singleton(importedModule), nameToModulesAll));
-
+ relatedModules.addAll(getImportedModules(allModules, Collections.singleton(importedModule),
+ nameToModulesAll));
}
}
return nameToModules;
}
- private static boolean selectAdditionalModules(final Module module, final Set<ModuleId> additionalModules){
+ private static boolean selectAdditionalModules(final Module module, final Set<ModuleId> additionalModules) {
return additionalModules.contains(new ModuleId(module.getName(), module.getRevision()));
}
for (ModuleId rootModule : rootModules) {
- if(rootModule.equals(new ModuleId(module.getName(), module.getRevision()))) {
+ if (rootModule.equals(new ModuleId(module.getName(), module.getRevision()))) {
return true;
}
//handling/checking imports regarding root modules
for (ModuleImport moduleImport : module.getImports()) {
- if(moduleImport.getModuleName().equals(rootModule.getName())) {
+ if (moduleImport.getModuleName().equals(rootModule.getName())) {
- if(moduleImport.getRevision() != null && !moduleImport.getRevision().equals(rootModule.getRev())) {
+ if (moduleImport.getRevision() != null && !moduleImport.getRevision().equals(rootModule.getRev())) {
return false;
}
private final Date rev;
public ModuleId(final String name, final Date rev) {
- Preconditions.checkArgument(!Strings.isNullOrEmpty(name), "No module dependency name given. Nothing to do.");
+ Preconditions.checkArgument(!Strings.isNullOrEmpty(name),
+ "No module dependency name given. Nothing to do.");
this.name = name;
this.rev = Preconditions.checkNotNull(rev, "No revision date given. Nothing to do.");
}
return rev;
}
- public static final Function<Module, ModuleId> MODULE_TO_MODULE_ID = new Function<Module, ModuleId>() {
- @Override
- public ModuleId apply(final Module input) {
- return new ModuleId(input.getName(), input.getRevision());
- }
- };
+ public static final Function<Module, ModuleId> MODULE_TO_MODULE_ID = input -> new ModuleId(input.getName(),
+ input.getRevision());
@Override
- public boolean equals(final Object o) {
- if (this == o) {
+ public boolean equals(final Object obj) {
+ if (this == obj) {
return true;
}
- if (!(o instanceof ModuleId)) {
+ if (!(obj instanceof ModuleId)) {
return false;
}
- ModuleId moduleId = (ModuleId) o;
+ ModuleId moduleId = (ModuleId) obj;
if (name != null ? !name.equals(moduleId.name) : moduleId.name != null) {
return false;
}
Code Review / yangtools.git / blobdiff