X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-maven-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang2sources%2Fplugin%2FConfigArg.java;fp=yang%2Fyang-maven-plugin%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang2sources%2Fplugin%2FConfigArg.java;h=5e6bb1157dfae1c9f34b5ec14ec55ed93ef131f9;hb=20afe6b8eb455068f68d101220b3882be198d82c;hp=0e8615a92861cb3bc9aad3a746d5bb193e285e1b;hpb=749a40ca62c0f007652f34d28308c2aadc5d9da4;p=yangtools.git diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java index 0e8615a928..5e6bb1157d 100644 --- a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java +++ b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/ConfigArg.java @@ -7,7 +7,8 @@ */ package org.opendaylight.yangtools.yang2sources.plugin; -import com.google.common.base.Preconditions; +import static java.util.Objects.requireNonNull; + import java.io.File; import java.util.HashMap; import java.util.Map; @@ -17,22 +18,17 @@ import org.apache.maven.project.MavenProject; * Base complex configuration arguments. */ public abstract class ConfigArg { - private final File outputBaseDir; - public ConfigArg(String outputBaseDir) { + public ConfigArg(final String outputBaseDir) { this.outputBaseDir = outputBaseDir == null ? null : new File(outputBaseDir); } - public File getOutputBaseDir(MavenProject project) { + public File getOutputBaseDir(final MavenProject project) { if (outputBaseDir == null) { return null; } - if (outputBaseDir.isAbsolute()) { - return outputBaseDir; - } else { - return new File(project.getBasedir(), outputBaseDir.getPath()); - } + return outputBaseDir.isAbsolute() ? outputBaseDir : new File(project.getBasedir(), outputBaseDir.getPath()); } public abstract void check(); @@ -51,16 +47,17 @@ public abstract class ConfigArg { super(null); } - public CodeGeneratorArg(String codeGeneratorClass) { + public CodeGeneratorArg(final String codeGeneratorClass) { this(codeGeneratorClass, null); } - public CodeGeneratorArg(String codeGeneratorClass, String outputBaseDir) { + public CodeGeneratorArg(final String codeGeneratorClass, final String outputBaseDir) { super(outputBaseDir); this.codeGeneratorClass = codeGeneratorClass; } - public CodeGeneratorArg(String codeGeneratorClass, String outputBaseDir, String resourceBaseDir) { + public CodeGeneratorArg(final String codeGeneratorClass, final String outputBaseDir, + final String resourceBaseDir) { super(outputBaseDir); this.codeGeneratorClass = codeGeneratorClass; this.resourceBaseDir = new File(resourceBaseDir); @@ -68,14 +65,14 @@ public abstract class ConfigArg { @Override public void check() { - Preconditions.checkNotNull(codeGeneratorClass, "codeGeneratorClass for CodeGenerator cannot be null"); + requireNonNull(codeGeneratorClass, "codeGeneratorClass for CodeGenerator cannot be null"); } public String getCodeGeneratorClass() { return codeGeneratorClass; } - public File getResourceBaseDir(MavenProject project) { + public File getResourceBaseDir(final MavenProject project) { if (resourceBaseDir == null) { // if it has not been set, use a default (correctly dealing with target/ VS target-ide) return new GeneratedDirectories(project).getYangServicesDir();