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

Timestamp:

2024-04-22T20:59:26+02:00 (4 weeks ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

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