Changeset 19048 in josm for trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java

Timestamp:

2024-04-19T16:21:11+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Dependency updates

ivy.xml

• org.eclipse.parsson:parsson: 1.1.5 -> 1.1.6
• org.apache.commons:commons-compress: 1.25.0 -> 1.26.1
  • Note: This deprecated some functions
• ch.poole:OpeningHoursParser: 0.28.1 -> 0.28.2
• org.jacoco:org.jacoco.ant: 0.8.11 -> 0.8.12
• com.github.spotbugs:spotbugs-annotations: 4.8.3 -> 4.8.4
• com.github.tomakehurst:wiremock: 2.35.0 -> 3.0.1
• io.github.classgraph:classgraph: 4.8.165 -> 4.8.171
• nl.jqno.equalsverifier:equalsverifier: 3.15.6 -> 3.16.1
• org.awaitility:awaitility: 4.2.0 -> 4.2.1

tools/ivy.xml

• com.puppycrawl.tools:checkstyle: 9.3 -> 10.15.0
• com.github.spotbugs:spotbugs: 4.8.3 -> 4.8.4
• com.google.errorprone: 2.(10.0|24.1) -> 2.26.1
• net.sourceforge.pmd:pmd was not updated to 7.0.0 due to a significant number of false positives.

There were some additional changes to cleanup new warnings and remove some
additional Java 8 files. There are more warnings that need to be cleaned up.

File:

• trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java (modified) (13 diffs)

trunk/src/org/openstreetmap/josm/data/validation/ValidatorCLI.java

@@ -11 +11 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
-import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -27 +26 @@
 import java.util.stream.Collectors;
 
-import org.apache.commons.compress.utils.FileNameUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.cli.CLIModule;
 import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.preferences.JosmBaseDirectories;
 import org.openstreetmap.josm.data.preferences.JosmUrls;
@@ -176 +174 @@
             }
             this.initialize();
-            final ProgressMonitor fileMonitor = progressMonitorFactory.get();
+            final var fileMonitor = progressMonitorFactory.get();
             fileMonitor.beginTask(tr("Processing files..."), this.input.size());
             for (String inputFile : this.input) {
@@ -202 +200 @@
      */
     private static void processMapcssFile(final String inputFile) throws ParseException {
-        final MapCSSStyleSource styleSource = new MapCSSStyleSource(new File(inputFile).toURI().getPath(), inputFile, inputFile);
+        final var styleSource = new MapCSSStyleSource(new File(inputFile).toURI().getPath(), inputFile, inputFile);
         styleSource.loadStyleSource();
         if (!styleSource.getErrors().isEmpty()) {
@@ -221 +219 @@
         // Check asserts
         Config.getPref().putBoolean("validator.check_assert_local_rules", true);
-        final MapCSSTagChecker mapCSSTagChecker = new MapCSSTagChecker();
-        final Collection<String> assertionErrors = new ArrayList<>();
+        final var mapCSSTagChecker = new MapCSSTagChecker();
+        final var assertionErrors = new ArrayList<String>();
         final MapCSSTagChecker.ParseResult result = mapCSSTagChecker.addMapCSS(new File(inputFile).toURI().getPath(),
                 assertionErrors::add);
@@ -247 +245 @@
      */
     private void processFile(final String inputFile) throws IllegalDataException, IOException {
-        final File inputFileFile = new File(inputFile);
+        final var inputFileFile = new File(inputFile);
         final List<FileImporter> inputFileImporters = ExtensionFileFilter.getImporters().stream()
                 .filter(importer -> importer.acceptFile(inputFileFile)).collect(Collectors.toList());
-        final Stopwatch stopwatch = Stopwatch.createStarted();
+        final var stopwatch = Stopwatch.createStarted();
         if (inputFileImporters.stream().noneMatch(fileImporter ->
                 fileImporter.importDataHandleExceptions(inputFileFile, progressMonitorFactory.get()))) {
@@ -263 +261 @@
                     .stream().filter(layer -> inputFileFile.equals(layer.getAssociatedFile()))
                     .findFirst().orElseThrow(() -> new JosmRuntimeException(tr("Could not find a layer for {0}", inputFile)));
-            final DataSet dataSet = dataLayer.getDataSet();
+            final var dataSet = dataLayer.getDataSet();
             if (this.changeFiles.containsKey(inputFile)) {
-                ProgressMonitor changeFilesMonitor = progressMonitorFactory.get();
+                final var changeFilesMonitor = progressMonitorFactory.get();
                 for (String changeFile : this.changeFiles.getOrDefault(inputFile, Collections.emptyList())) {
-                    try (InputStream changeStream = Compression.getUncompressedFileInputStream(Paths.get(changeFile))) {
+                    try (var changeStream = Compression.getUncompressedFileInputStream(Paths.get(changeFile))) {
                         dataSet.mergeFrom(OsmChangeReader.parseDataSet(changeStream, changeFilesMonitor));
                     }
                 }
             }
-            Path path = Paths.get(outputFile);
+            final var path = Paths.get(outputFile);
             if (path.toFile().isFile() && !Files.deleteIfExists(path)) {
                 Logging.error("Could not delete {0}, attempting to append", outputFile);
             }
-            GeoJSONMapRouletteWriter geoJSONMapRouletteWriter = new GeoJSONMapRouletteWriter(dataSet);
+            final var geoJSONMapRouletteWriter = new GeoJSONMapRouletteWriter(dataSet);
             OsmValidator.initializeTests();
 
-            try (OutputStream fileOutputStream = Files.newOutputStream(path)) {
+            try (var fileOutputStream = Files.newOutputStream(path)) {
                 // The first writeErrors catches anything that was written, for whatever reason. This is probably never
                 // going to be called.
-                ValidationTask validationTask = new ValidationTask(errors -> writeErrors(geoJSONMapRouletteWriter, fileOutputStream, errors),
+                final var validationTask = new ValidationTask(errors -> writeErrors(geoJSONMapRouletteWriter, fileOutputStream, errors),
                         progressMonitorFactory.get(), OsmValidator.getEnabledTests(false),
                         dataSet.allPrimitives(), Collections.emptyList(), false);
@@ -320 +318 @@
      */
     private static String getDefaultOutputName(final String inputString) {
-        final String extension = FileNameUtils.getExtension(inputString);
+        final String extension = FilenameUtils.getExtension(inputString);
         if (!Arrays.asList("zip", "bz", "xz", "geojson").contains(extension)) {
-            return FileNameUtils.getBaseName(inputString) + ".geojson";
+            return FilenameUtils.getBaseName(inputString) + ".geojson";
         } else if ("geojson".equals(extension)) {
             // Account for geojson input files
-            return FileNameUtils.getBaseName(inputString) + ".validated.geojson";
-        }
-        return FileNameUtils.getBaseName(FileNameUtils.getBaseName(inputString)) + ".geojson";
+            return FilenameUtils.getBaseName(inputString) + ".validated.geojson";
+        }
+        return FilenameUtils.getBaseName(FilenameUtils.getBaseName(inputString)) + ".geojson";
     }
 
@@ -348 +346 @@
     /**
      * Initialize everything that might be needed
-     *
+     * <p>
      * Arguments may need to be parsed first.
      */
@@ -369 +367 @@
         Logging.setLogLevel(Level.INFO);
 
-        OptionParser parser = new OptionParser("JOSM validate");
-        final AtomicReference<String> currentInput = new AtomicReference<>(null);
+        final var parser = new OptionParser("JOSM validate");
+        final var currentInput = new AtomicReference<String>(null);
         for (Option o : Option.values()) {
             if (o.requiresArgument()) {
@@ -425 +423 @@
             break;
         case LOAD_PREFERENCES:
-            final Preferences tempPreferences = new Preferences();
+            final var tempPreferences = new Preferences();
             tempPreferences.enableSaveOnPut(false);
-            CustomConfigurator.XMLCommandProcessor config = new CustomConfigurator.XMLCommandProcessor(tempPreferences);
+            final var config = new CustomConfigurator.XMLCommandProcessor(tempPreferences);
             try (InputStream is = Utils.openStream(new File(argument).toURI().toURL())) {
                 config.openAndReadXML(is);
@@ -435 +433 @@
             final IPreferences pref = Config.getPref();
             if (pref instanceof MemoryPreferences) {
-                final MemoryPreferences memoryPreferences = (MemoryPreferences) pref;
+                final var memoryPreferences = (MemoryPreferences) pref;
                 tempPreferences.getAllSettings().forEach(memoryPreferences::putSetting);
             } else {
@@ -454 +452 @@
 
     private static String getHelp() {
-        final String helpPadding = "\t                          ";
+        final var helpPadding = "\t                          ";
         // CHECKSTYLE.OFF: SingleSpaceSeparator
         return tr("JOSM Validation command line interface") + "\n\n" +