diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-03 16:04:57 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-01-03 17:24:59 +0100 |
commit | de2d8e0287bc4050e123e1356fcfc09504274d19 (patch) | |
tree | c769f27e44ccb0a9514e305888c83cbba118ea35 /config-class-plugin | |
parent | 741fad2983111ea1589ab008b60b97a12072556b (diff) |
Remove use of apache commons libraries in config-class-plugin
Diffstat (limited to 'config-class-plugin')
-rw-r--r-- | config-class-plugin/pom.xml | 4 | ||||
-rw-r--r-- | config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/config-class-plugin/pom.xml b/config-class-plugin/pom.xml index e0ea70bd4f0..4809db247d4 100644 --- a/config-class-plugin/pom.xml +++ b/config-class-plugin/pom.xml @@ -30,10 +30,6 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.5</version> diff --git a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java index 64941fdc1a2..9930d53ca6c 100644 --- a/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java +++ b/config-class-plugin/src/main/java/com/yahoo/vespa/ConfigGenMojo.java @@ -1,11 +1,9 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa; -import com.yahoo.config.codegen.DefParser; import com.yahoo.config.codegen.MakeConfig; import com.yahoo.config.codegen.MakeConfigProperties; import com.yahoo.config.codegen.PropertyException; -import org.apache.commons.io.FileUtils; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.LifecyclePhase; @@ -16,9 +14,12 @@ import org.apache.maven.project.MavenProject; import java.io.File; import java.io.FilenameFilter; import java.io.IOException; +import java.io.UncheckedIOException; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; -import java.util.Collection; import java.util.List; +import java.util.stream.Collectors; import static com.yahoo.config.codegen.DefParser.DEFAULT_PACKAGE_PREFIX; @@ -160,8 +161,11 @@ public class ConfigGenMojo extends AbstractMojo { private boolean isSomeGeneratedFileStale(File outputDirectory, List<String> defFileNames) { long oldestGeneratedModifiedTime = Long.MAX_VALUE; - final Collection<File> files = FileUtils.listFiles(outputDirectory, null, true); - if (files != null) { + try { + List<File> files = Files.walk(outputDirectory.toPath()) + .filter(Files::isRegularFile) + .map(Path::toFile) + .collect(Collectors.toList()); for (File f : files) { getLog().debug("Checking generated file " + f); final long l = f.lastModified(); @@ -169,6 +173,8 @@ public class ConfigGenMojo extends AbstractMojo { oldestGeneratedModifiedTime = l; } } + } catch (IOException e) { + throw new UncheckedIOException(e); } long lastModifiedSource = 0; |