From f1618ffef714a89d86c14c3521aee3ed1b7e9c27 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 11 Apr 2015 17:03:58 +0200 Subject: [PATCH] Fix constant names Constants should have capitalized names. Fixes a few sonar warnings. Change-Id: I600b482a817055784874e91f9cb8c5b06b948302 Signed-off-by: Robert Varga --- .../maven/sal/api/gen/plugin/CodeGeneratorImpl.java | 10 +++++----- .../yang/binding/util/BindingReflections.java | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java index 867aca948f..40387d8cba 100644 --- a/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java +++ b/code-generator/maven-sal-api-gen-plugin/src/main/java/org/opendaylight/yangtools/maven/sal/api/gen/plugin/CodeGeneratorImpl.java @@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory; import org.sonatype.plexus.build.incremental.BuildContext; public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContextAware, MavenProjectAware { - private static final Logger logger = LoggerFactory.getLogger(CodeGeneratorImpl.class); + private static final Logger LOG = LoggerFactory.getLogger(CodeGeneratorImpl.class); private static final String FS = File.separator; private BuildContext buildContext; private File projectBaseDir; @@ -87,7 +87,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext // TODO: do not mutate parameters, output of a method is defined by its return value Set moduleInfoProviders = generateYangModuleInfo(outputBaseDir, module, context, currentProvidersBuilder); ImmutableSet currentProviders = currentProvidersBuilder.build(); - logger.info("Adding ModuleInfo providers {}", currentProviders); + LOG.info("Adding ModuleInfo providers {}", currentProviders); bindingProviders.addAll(currentProviders); result.addAll(moduleInfoProviders); } @@ -114,7 +114,7 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext File outputBaseDir; outputBaseDir = new File(DEFAULT_OUTPUT_BASE_DIR_PATH); setOutputBaseDirAsSourceFolder(outputBaseDir, mavenProject); - logger.debug("Adding " + outputBaseDir.getPath() + " as compile source root"); + LOG.debug("Adding " + outputBaseDir.getPath() + " as compile source root"); return outputBaseDir; } @@ -183,10 +183,10 @@ public final class CodeGeneratorImpl implements BasicCodeGenerator, BuildContext bw.write(source); } } catch (Exception e) { - logger.error("Could not write file: {}",file,e); + LOG.error("Could not write file: {}",file,e); } } catch (Exception e) { - logger.error("Could not create file: {}",file,e); + LOG.error("Could not create file: {}",file,e); } return file; } diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java index 3f4c85e4b2..46bd9327d1 100644 --- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java +++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/BindingReflections.java @@ -57,7 +57,7 @@ public class BindingReflections { private static final Pattern ROOT_PACKAGE_PATTERN = Pattern.compile(ROOT_PACKAGE_PATTERN_STRING); private static final Logger LOG = LoggerFactory.getLogger(BindingReflections.class); - private static final LoadingCache, Optional> classToQName = CacheBuilder.newBuilder() // + private static final LoadingCache, Optional> CLASS_TO_QNAME = CacheBuilder.newBuilder() // .weakKeys() // .expireAfterAccess(EXPIRATION_TIME, TimeUnit.SECONDS) // .build(new ClassToQNameLoader()); @@ -127,7 +127,7 @@ public class BindingReflections { * May return null if QName is not present. */ public static final QName findQName(final Class dataType) { - return classToQName.getUnchecked(dataType).orNull(); + return CLASS_TO_QNAME.getUnchecked(dataType).orNull(); } /** -- 2.36.6