Cleanup YangToSourceProcessor

Use java.util.Objects.requireNonNull() instead of
Preconditions.checkNotNull().

Simplify and speed up delta change detection.

Change-Id: I3c41d3245554ac41127042c8285c03c5a5666865
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
index ff274d19e22403a57f76eee5f6e6013ee2cb598d..afe1043bbb88c7f84e819faa9c2542747cf7f25a 100644 (file)
--- a/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
+++ b/yang/yang-maven-plugin/src/main/java/org/opendaylight/yangtools/yang2sources/plugin/YangToSourcesProcessor.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.yangtools.yang2sources.plugin;
 
+import static java.util.Objects.requireNonNull;
+
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Throwables;
@@ -67,13 +69,13 @@ class YangToSourcesProcessor {
     private YangToSourcesProcessor(final BuildContext buildContext, final File yangFilesRootDir,
             final Collection<File> excludedFiles, final List<CodeGeneratorArg> codeGenerators,
             final MavenProject project, final boolean inspectDependencies, final YangProvider yangProvider) {
-        this.buildContext = Preconditions.checkNotNull(buildContext, "buildContext");
-        this.yangFilesRootDir = Preconditions.checkNotNull(yangFilesRootDir, "yangFilesRootDir");
+        this.buildContext = requireNonNull(buildContext, "buildContext");
+        this.yangFilesRootDir = requireNonNull(yangFilesRootDir, "yangFilesRootDir");
         this.excludedFiles = ImmutableSet.copyOf(excludedFiles);
         this.codeGenerators = ImmutableList.copyOf(codeGenerators);
-        this.project = Preconditions.checkNotNull(project);
+        this.project = requireNonNull(project);
         this.inspectDependencies = inspectDependencies;
-        this.yangProvider = Preconditions.checkNotNull(yangProvider);
+        this.yangProvider = requireNonNull(yangProvider);
     }
 
     @VisibleForTesting
@@ -157,16 +159,7 @@ class YangToSourcesProcessor {
              * Check if any of the listed files changed. If no changes occurred,
              * simply return null, which indicates and of execution.
              */
-            boolean noChange = true;
-            for (final File f : allFiles) {
-                if (buildContext.hasDelta(f)) {
-                    LOG.debug("{} buildContext {} indicates {} changed, forcing regeneration", LOG_PREFIX,
-                            buildContext, f);
-                    noChange = false;
-                }
-            }
-
-            if (noChange) {
+            if (!allFiles.stream().anyMatch(buildContext::hasDelta)) {
                 LOG.info("{} None of {} input files changed", LOG_PREFIX, allFiles.size());
                 return Optional.empty();
             }
@@ -278,12 +271,8 @@ class YangToSourcesProcessor {
         final BasicCodeGenerator g = getInstance(codeGeneratorCfg.getCodeGeneratorClass(), BasicCodeGenerator.class);
         LOG.info("{} Code generator instantiated from {}", LOG_PREFIX, codeGeneratorCfg.getCodeGeneratorClass());
 
-        final File outputDir = codeGeneratorCfg.getOutputBaseDir(project);
-
-        if (outputDir == null) {
-            throw new NullPointerException("outputBaseDir is null. Please provide a valid outputBaseDir value in the "
-                    + "pom.xml");
-        }
+        final File outputDir = requireNonNull(codeGeneratorCfg.getOutputBaseDir(project),
+            "outputBaseDir is null. Please provide a valid outputBaseDir value in pom.xml");
 
         project.addCompileSourceRoot(outputDir.getAbsolutePath());