From bcf3f4d053feade35f761ccbedda6b093fa36c0c Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 14 Sep 2015 12:12:55 +0200 Subject: [PATCH] Cleanup yang-model-util Various warnings fixed. Change-Id: Id2e7c6f100e2b6698204dfb70243b33d33be2488 Signed-off-by: Robert Varga --- .../util/FilesystemSchemaSourceCache.java | 8 ++--- .../model/util/AbstractUnsignedInteger.java | 9 +++-- .../util/FilteringSchemaContextProxy.java | 36 +++++++++---------- .../util/FilesystemSchemaSourceCacheTest.java | 2 +- .../model/util/SchemaContextProxyTest.java | 22 ++++++------ 5 files changed, 34 insertions(+), 43 deletions(-) diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java index cecc17f8b0..fd951f7ed2 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCache.java @@ -230,10 +230,6 @@ public final class FilesystemSchemaSourceCache getSupportedType() { - return supportedType; - } - public T restore(final SourceIdentifier sourceIdentifier, final File cachedSource) { Preconditions.checkArgument(cachedSource.isFile()); Preconditions.checkArgument(cachedSource.exists()); @@ -295,9 +291,9 @@ public final class FilesystemSchemaSourceCache getSourceIdentifier(final String fileName) { + private static Optional getSourceIdentifier(final String fileName) { final Matcher matcher = CACHED_FILE_PATTERN.matcher(fileName); - if(matcher.matches()) { + if (matcher.matches()) { final String moduleName = matcher.group("moduleName"); final String revision = matcher.group("revision"); return Optional.of(new SourceIdentifier(moduleName, Optional.fromNullable(revision))); diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java index d5c904fd72..f17c741dc4 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/AbstractUnsignedInteger.java @@ -8,10 +8,8 @@ package org.opendaylight.yangtools.yang.model.util; import com.google.common.base.Optional; - import java.util.Collections; import java.util.List; - import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; @@ -36,11 +34,12 @@ import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinit * */ abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefinition { + private static final String REFERENCE = "https://tools.ietf.org/html/rfc6020#section-9.2"; + private static final Optional OPT_REF = Optional.of("https://tools.ietf.org/html/rfc6020#section-9.2.4"); private static final long MIN_VALUE = 0; private final QName name; private final SchemaPath path; private final String description; - private static final String REFERENCE = "https://tools.ietf.org/html/rfc6020#section-9.2"; private final String units; private final List rangeStatements; @@ -58,8 +57,8 @@ abstract class AbstractUnsignedInteger implements UnsignedIntegerTypeDefinition this.description = description; this.units = units; final String rangeDescription = "Integer values between " + MIN_VALUE + " and " + maxRange + ", inclusively."; - this.rangeStatements = Collections.singletonList(BaseConstraints.newRangeConstraint(MIN_VALUE, maxRange, Optional.of(rangeDescription), - Optional.of("https://tools.ietf.org/html/rfc6020#section-9.2.4"))); + this.rangeStatements = Collections.singletonList(BaseConstraints.newRangeConstraint(MIN_VALUE, maxRange, + Optional.of(rangeDescription), OPT_REF)); } @Override diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java index b0a9d8fc88..b507099d64 100644 --- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java +++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/FilteringSchemaContextProxy.java @@ -104,41 +104,42 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { private static TreeMultimap getStringModuleTreeMultimap() { return TreeMultimap.create(new Comparator() { @Override - public int compare(String o1, String o2) { + public int compare(final String o1, final String o2) { return o1.compareTo(o2); } }, REVISION_COMPARATOR); } - private void processForAdditionalModules(SchemaContext delegate, final Set additionalModuleIds, Builder filteredModulesBuilder) { + private static void processForAdditionalModules(final SchemaContext delegate, + final Set additionalModuleIds, final Builder filteredModulesBuilder) { filteredModulesBuilder.addAll(Collections2.filter(delegate.getModules(), new Predicate() { @Override - public boolean apply(@Nullable Module module) { + public boolean apply(@Nullable final Module module) { return selectAdditionalModules(module, additionalModuleIds); } })); } - private void processForRootModules(SchemaContext delegate, final Collection rootModules, Builder filteredModulesBuilder) { + private void processForRootModules(final SchemaContext delegate, final Collection rootModules, final Builder filteredModulesBuilder) { filteredModulesBuilder.addAll(Collections2.filter(delegate.getModules(), new Predicate() { @Override - public boolean apply(@Nullable Module module) { + public boolean apply(@Nullable final Module module) { return checkModuleDependency(module, rootModules); } })); } - private Multimap getStringModuleMap(SchemaContext delegate) { + private static Multimap getStringModuleMap(final SchemaContext delegate) { return Multimaps.index(delegate.getModules(), new Function() { @Override - public String apply(Module input) { + public String apply(final Module input) { return input.getName(); } }); } //dealing with imported module other than root and directly importing root - private static Collection getImportedModules(Map allModules, Set baseModules, TreeMultimap nameToModulesAll) { + private static Collection getImportedModules(final Map allModules, final Set baseModules, final TreeMultimap nameToModulesAll) { List relatedModules = Lists.newLinkedList(); @@ -168,6 +169,7 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { return identifiersToSources; } + @Override public Set getModules() { return filteredModules; } @@ -182,18 +184,12 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { return nameToModules; } - private boolean selectAdditionalModules(Module module, Set additionalModules){ - - if(additionalModules.contains(new ModuleId(module.getName(), module.getRevision()))){ - - return true; - } - - return false; + private static boolean selectAdditionalModules(final Module module, final Set additionalModules){ + return additionalModules.contains(new ModuleId(module.getName(), module.getRevision())); } //check for any dependency regarding given string - private boolean checkModuleDependency(Module module, Collection rootModules) { + private boolean checkModuleDependency(final Module module, final Collection rootModules) { for (ModuleId rootModule : rootModules) { @@ -232,7 +228,7 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { private final String name; private final Date rev; - public ModuleId(String name, Date rev) { + public ModuleId(final String name, final Date rev) { 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."); @@ -248,13 +244,13 @@ public final class FilteringSchemaContextProxy extends AbstractSchemaContext { public static final Function MODULE_TO_MODULE_ID = new Function() { @Override - public ModuleId apply(Module input) { + public ModuleId apply(final Module input) { return new ModuleId(input.getName(), input.getRevision()); } }; @Override - public boolean equals(Object o) { + public boolean equals(final Object o) { if (this == o) { return true; } diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java index 7b98d2a2fd..393da03349 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/repo/util/FilesystemSchemaSourceCacheTest.java @@ -90,7 +90,7 @@ public class FilesystemSchemaSourceCacheTest { assertEquals(2, storedFilesAfterNewCache.size()); } - private Collection filesToFilenamesWithoutRevision(final List storedFiles) { + private static Collection filesToFilenamesWithoutRevision(final List storedFiles) { return Collections2.transform(storedFiles, new Function() { @Override public String apply(final File input) { diff --git a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java index d80a93df55..8be97cddd7 100644 --- a/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java +++ b/yang/yang-model-util/src/test/java/org/opendaylight/yangtools/yang/model/util/SchemaContextProxyTest.java @@ -53,8 +53,7 @@ public class SchemaContextProxyTest { revision2 = SimpleDateFormatUtil.getRevisionFormat().parse("2015-01-15"); } - private SchemaContext mockSchema(final Module... module) { - + private static SchemaContext mockSchema(final Module... module) { SchemaContext mock = mock(SchemaContext.class); doReturn(Sets.newHashSet(module)).when(mock).getModules(); return mock; @@ -317,7 +316,7 @@ public class SchemaContextProxyTest { * */ @Test - public void testImportNoRevision() throws Exception { + public void testImportNoRevision() { Module moduleConfig = mockModule(CONFIG_NAME, revision); Module module2 = mockModule(MODULE2_NAME, revision); @@ -344,7 +343,7 @@ public class SchemaContextProxyTest { * */ @Test - public void testBasicSubmodule() throws Exception { + public void testBasicSubmodule() { Module moduleConfig = mockModule(CONFIG_NAME); Module module2 = mockModule(MODULE2_NAME); Module module3 = mockModule(MODULE3_NAME); @@ -415,7 +414,7 @@ public class SchemaContextProxyTest { assertProxyContext(filteringSchemaContextProxy, moduleConfig, module2, module3, module4); } - private void assertProxyContext(final FilteringSchemaContextProxy filteringSchemaContextProxy, final Module... expected) { + private static void assertProxyContext(final FilteringSchemaContextProxy filteringSchemaContextProxy, final Module... expected) { Set modSet = Sets.newHashSet(); @@ -443,7 +442,8 @@ public class SchemaContextProxyTest { } } - private FilteringSchemaContextProxy createProxySchemaCtx(final SchemaContext schemaContext, final Set additionalModules, final Module... modules) { + private static FilteringSchemaContextProxy createProxySchemaCtx(final SchemaContext schemaContext, + final Set additionalModules, final Module... modules) { Set modulesSet = new HashSet<>(); @@ -456,7 +456,7 @@ public class SchemaContextProxyTest { return new FilteringSchemaContextProxy(schemaContext, createModuleIds(modulesSet) , createModuleIds(additionalModules)); } - private Set createModuleIds(final Set modules) { + private static Set createModuleIds(final Set modules) { Set moduleIds = Sets.newHashSet(); @@ -471,7 +471,7 @@ public class SchemaContextProxyTest { return moduleIds; } - private void mockSubmodules(final Module mainModule, final Module... submodules){ + private static void mockSubmodules(final Module mainModule, final Module... submodules) { Set submodulesSet = new HashSet<>(); submodulesSet.addAll(Arrays.asList(submodules)); @@ -479,7 +479,7 @@ public class SchemaContextProxyTest { doReturn(submodulesSet).when(mainModule).getSubmodules(); } - private void mockModuleImport(final Module importer, final Module... imports) { + private static void mockModuleImport(final Module importer, final Module... imports) { Set mockedImports = Sets.newHashSet(); for (final Module module : imports) { mockedImports.add(new ModuleImport() { @@ -509,7 +509,7 @@ public class SchemaContextProxyTest { } //mock module with revision - private Module mockModule(final String name, final Date rev){ + private static Module mockModule(final String name, final Date rev) { final Module mod = mockModule(name); @@ -521,7 +521,7 @@ public class SchemaContextProxyTest { } //mock module with default revision - private Module mockModule(final String mName) { + private static Module mockModule(final String mName) { Module mockedModule = mock(Module.class); doReturn(mName).when(mockedModule).getName(); -- 2.36.6