You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@baremaps.apache.org by bc...@apache.org on 2024/06/13 18:34:20 UTC
(incubator-baremaps) 01/04: Suppress warnings related to picocli's print writer
This is an automated email from the ASF dual-hosted git repository.
bchapuis pushed a commit to branch sonar
in repository https://gitbox.apache.org/repos/asf/incubator-baremaps.git
commit ea73de3933b213c8044f05d83fe8a21284405441
Author: Bertil Chapuis <bc...@gmail.com>
AuthorDate: Thu Jun 13 20:23:50 2024 +0200
Suppress warnings related to picocli's print writer
---
.../src/main/java/org/apache/baremaps/cli/Baremaps.java | 13 ++++++++++---
.../java/org/apache/baremaps/cli/database/Database.java | 5 ++++-
.../java/org/apache/baremaps/cli/database/ExecuteSql.java | 5 ++++-
.../java/org/apache/baremaps/cli/database/ImportOsm.java | 5 ++++-
.../java/org/apache/baremaps/cli/database/UpdateOsm.java | 5 ++++-
.../java/org/apache/baremaps/cli/geocoder/Geocoder.java | 8 ++++++--
.../main/java/org/apache/baremaps/cli/geocoder/Search.java | 5 ++++-
.../main/java/org/apache/baremaps/cli/geocoder/Serve.java | 5 ++++-
.../src/main/java/org/apache/baremaps/cli/iploc/IpLoc.java | 7 +++++--
.../src/main/java/org/apache/baremaps/cli/iploc/Serve.java | 5 ++++-
.../src/main/java/org/apache/baremaps/cli/map/Dev.java | 5 ++++-
.../src/main/java/org/apache/baremaps/cli/map/Export.java | 5 ++++-
.../src/main/java/org/apache/baremaps/cli/map/Init.java | 5 ++++-
.../src/main/java/org/apache/baremaps/cli/map/MBTiles.java | 5 ++++-
.../src/main/java/org/apache/baremaps/cli/map/Map.java | 9 ++++++---
.../src/main/java/org/apache/baremaps/cli/map/Serve.java | 5 ++++-
.../main/java/org/apache/baremaps/cli/workflow/Execute.java | 5 ++++-
.../main/java/org/apache/baremaps/cli/workflow/Init.java | 5 ++++-
.../java/org/apache/baremaps/cli/workflow/Workflow.java | 7 +++++--
19 files changed, 88 insertions(+), 26 deletions(-)
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
index e931ff65..ca8ff7d6 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/Baremaps.java
@@ -31,17 +31,24 @@ import org.apache.baremaps.cli.map.Map;
import org.apache.baremaps.cli.workflow.Workflow;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.core.config.Configurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.IVersionProvider;
import picocli.CommandLine.Option;
-@Command(name = "baremaps", description = "A toolkit for producing vector tiles.",
- versionProvider = VersionProvider.class, subcommands = {Workflow.class, Database.class,
- Map.class, Geocoder.class, IpLoc.class},
+@Command(
+ name = "baremaps",
+ description = "A toolkit for producing vector tiles.",
+ versionProvider = VersionProvider.class,
+ subcommands = {Workflow.class, Database.class, Map.class, Geocoder.class, IpLoc.class},
sortOptions = false)
+@SuppressWarnings("squid:S106")
public class Baremaps implements Callable<Integer> {
+ private static final Logger logger = LoggerFactory.getLogger(Baremaps.class);
+
@Option(names = {"-V", "--version"}, versionHelp = true, description = "Print version info.")
boolean version;
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/Database.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/Database.java
index fcf1cb6e..5bdcf3d7 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/Database.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/Database.java
@@ -22,9 +22,12 @@ package org.apache.baremaps.cli.database;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "database", description = "Database commands.",
+@Command(
+ name = "database",
+ description = "Database commands.",
subcommands = {ExecuteSql.class, ImportOsm.class, UpdateOsm.class},
sortOptions = false)
+@SuppressWarnings("squid:S106")
public class Database implements Runnable {
@Override
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ExecuteSql.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ExecuteSql.java
index ada71330..f6ac9f05 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ExecuteSql.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ExecuteSql.java
@@ -27,7 +27,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "execute-sql", description = "Execute SQL queries in the database.")
+@Command(
+ name = "execute-sql",
+ description = "Execute SQL queries in the database.")
+@SuppressWarnings("squid:S106")
public class ExecuteSql implements Callable<Integer> {
@Mixin
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOsm.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOsm.java
index ad962fcc..b470319f 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOsm.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/ImportOsm.java
@@ -27,7 +27,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "import-osm", description = "Import OpenStreetMap data in Postgres.")
+@Command(
+ name = "import-osm",
+ description = "Import OpenStreetMap data in Postgres.")
+@SuppressWarnings("squid:S106")
public class ImportOsm implements Callable<Integer> {
@Mixin
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java
index 11fb8d6c..2502c4fe 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/database/UpdateOsm.java
@@ -27,7 +27,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "update-osm", description = "Update OpenStreetMap data in Postgres.")
+@Command(
+ name = "update-osm",
+ description = "Update OpenStreetMap data in Postgres.")
+@SuppressWarnings("squid:S106")
public class UpdateOsm implements Callable<Integer> {
@Mixin
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Geocoder.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Geocoder.java
index 766c205d..d9d2dbb1 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Geocoder.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Geocoder.java
@@ -22,8 +22,12 @@ package org.apache.baremaps.cli.geocoder;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "geocoder", description = "Geocoder commands (experimental).",
- subcommands = {Serve.class, Search.class}, sortOptions = false)
+@Command(
+ name = "geocoder",
+ description = "Geocoder commands (experimental).",
+ sortOptions = false,
+ subcommands = {Serve.class, Search.class})
+@SuppressWarnings("squid:S106")
public class Geocoder implements Runnable {
@Override
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Search.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Search.java
index 379b0c27..e14fbc2a 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Search.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Search.java
@@ -29,7 +29,10 @@ import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-@Command(name = "search", description = "Search geonames index.")
+@Command(
+ name = "search",
+ description = "Search geonames index.")
+@SuppressWarnings("squid:S106")
public class Search implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Search.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Serve.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Serve.java
index 3af14e17..8a3afb24 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Serve.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/geocoder/Serve.java
@@ -39,7 +39,10 @@ import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-@Command(name = "serve", description = "Start a tile server with caching capabilities.")
+@Command(
+ name = "serve",
+ description = "Start a tile server with caching capabilities.")
+@SuppressWarnings("squid:S106")
public class Serve implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Serve.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/IpLoc.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/IpLoc.java
index 355de748..f17b9d3b 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/IpLoc.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/IpLoc.java
@@ -22,8 +22,11 @@ package org.apache.baremaps.cli.iploc;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "iploc", subcommands = {Serve.class},
- description = "IP to location commands (experimental).")
+@Command(
+ name = "iploc",
+ description = "IP to location commands (experimental).",
+ subcommands = {Serve.class})
+@SuppressWarnings("squid:S106")
public class IpLoc implements Runnable {
@Override
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/Serve.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/Serve.java
index f7aeefc5..0f129334 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/Serve.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/iploc/Serve.java
@@ -39,7 +39,10 @@ import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-@Command(name = "serve", description = "Start an IP to location web service.")
+@Command(
+ name = "serve",
+ description = "Start an IP to location web service.")
+@SuppressWarnings("squid:S106")
public class Serve implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Serve.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
index 2ba6c766..13b37356 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Dev.java
@@ -48,7 +48,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "dev", description = "Start a development server with live reload.")
+@Command(
+ name = "dev",
+ description = "Start a development server with live reload.")
+@SuppressWarnings("squid:S106")
public class Dev implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Dev.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Export.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Export.java
index 741e3403..197a0545 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Export.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Export.java
@@ -30,7 +30,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "export", description = "Export vector tiles from the database.")
+@Command(
+ name = "export",
+ description = "Export vector tiles from the database.")
+@SuppressWarnings("squid:S106")
public class Export implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Export.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java
index 0542db86..e7c116ed 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Init.java
@@ -34,7 +34,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "init", description = "Init configuration files.")
+@Command(
+ name = "init",
+ description = "Init configuration files.")
+@SuppressWarnings("squid:S106")
public class Init implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Init.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/MBTiles.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/MBTiles.java
index 1644e719..9628169d 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/MBTiles.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/MBTiles.java
@@ -46,7 +46,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "mbtiles", description = "Start a mbtiles server with caching capabilities.")
+@Command(
+ name = "mbtiles",
+ description = "Start a mbtiles server with caching capabilities.")
+@SuppressWarnings("squid:S106")
public class MBTiles implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(MBTiles.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Map.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Map.java
index fa825607..296c3132 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Map.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Map.java
@@ -22,9 +22,12 @@ package org.apache.baremaps.cli.map;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "map", description = "Map commands.",
- subcommands = {Init.class, Export.class, Serve.class, Dev.class, MBTiles.class},
- sortOptions = false)
+@Command(
+ name = "map",
+ description = "Map commands.",
+ sortOptions = false,
+ subcommands = {Init.class, Export.class, Serve.class, Dev.class, MBTiles.class})
+@SuppressWarnings("squid:S106")
public class Map implements Runnable {
@Override
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
index cd99a8d2..fc6c648d 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/map/Serve.java
@@ -50,7 +50,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "serve", description = "Start a tile server with caching capabilities.")
+@Command(
+ name = "serve",
+ description = "Start a tile server with caching capabilities.")
+@SuppressWarnings("squid:S106")
public class Serve implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Serve.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Execute.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Execute.java
index 6e67645e..e290f9c4 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Execute.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Execute.java
@@ -31,7 +31,10 @@ import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
-@Command(name = "execute", description = "Execute a workflow.")
+@Command(
+ name = "execute",
+ description = "Execute a workflow.")
+@SuppressWarnings("squid:S106")
public class Execute implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Execute.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Init.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Init.java
index 5179ab23..c1de8793 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Init.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Init.java
@@ -31,7 +31,10 @@ import org.slf4j.LoggerFactory;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-@Command(name = "init", description = "Initialize a workflow.")
+@Command(
+ name = "init",
+ description = "Initialize a workflow.")
+@SuppressWarnings("squid:S106")
public class Init implements Callable<Integer> {
private static final Logger logger = LoggerFactory.getLogger(Init.class);
diff --git a/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Workflow.java b/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Workflow.java
index c23ebbaa..10891a31 100644
--- a/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Workflow.java
+++ b/baremaps-cli/src/main/java/org/apache/baremaps/cli/workflow/Workflow.java
@@ -22,8 +22,11 @@ package org.apache.baremaps.cli.workflow;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "workflow", subcommands = {Init.class, Execute.class},
- description = "Manage a workflow.")
+@Command(
+ name = "workflow",
+ description = "Manage a workflow.",
+ subcommands = {Init.class, Execute.class})
+@SuppressWarnings("squid:S106")
public class Workflow implements Runnable {
@Override