Clean code and fix issues detected by sonar

baremaps-cli/src/main/java/org/apache/baremaps/cli/dem/VectorTileContours.java

@@ -38,7 +38,7 @@
 import picocli.CommandLine.Option;
 
 @Command(name = "vector-contours", description = "Generate vector contours from a DEM.")
-@SuppressWarnings("squid:S106")
+@SuppressWarnings({"squid:S106", "squid:S3864"})
 public class VectorTileContours implements Callable<Integer> {
 
   @Option(names = {"--path"}, paramLabel = "PATH", description = "The path of a geoTIFF file.")

baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileStoreException.java

@@ -21,7 +21,7 @@
 public class TileStoreException extends Exception {
 
   /**
-   * Constructs an {@code BlobStoreException} with the specified detail message.
+   * Constructs an {@code TileStoreException} with the specified detail message.
    *
    * @param message the message
    */
@@ -30,7 +30,7 @@ public TileStoreException(String message) {
   }
 
   /**
-   * Constructs a {@code BlobStoreException} with the specified cause.
+   * Constructs a {@code TileStoreException} with the specified cause.
    *
    * @param cause the cause
    */
@@ -39,7 +39,7 @@ public TileStoreException(Throwable cause) {
   }
 
   /**
-   * Constructs a {@code BlobStoreException} with the specified detail message and cause.
+   * Constructs a {@code TileStoreException} with the specified detail message and cause.
    *
    * @param message the message
    * @param cause the cause

baremaps-core/src/test/java/org/apache/baremaps/tilestore/raster/VectorHillshadeTileStoreTest.java → baremaps-core/src/main/java/org/apache/baremaps/tilestore/raster/GeoTiffException.java

@@ -17,10 +17,33 @@
 
 package org.apache.baremaps.tilestore.raster;
 
-import static org.junit.jupiter.api.Assertions.*;
+public class GeoTiffException extends Exception {
 
+  /**
+   * Constructs an {@code GeoTiffException} with the specified detail message.
+   *
+   * @param message the message
+   */
+  public GeoTiffException(String message) {
+    super(message);
+  }
 
-class VectorHillshadeTileStoreTest {
-
+  /**
+   * Constructs a {@code GeoTiffException} with the specified cause.
+   *
+   * @param cause the cause
+   */
+  public GeoTiffException(Throwable cause) {
+    super(cause);
+  }
 
+  /**
+   * Constructs a {@code GeoTiffException} with the specified detail message and cause.
+   *
+   * @param message the message
+   * @param cause the cause
+   */
+  public GeoTiffException(String message, Throwable cause) {
+    super(message, cause);
+  }
 }

baremaps-core/src/main/java/org/apache/baremaps/tilestore/raster/GeoTiffReader.java

@@ -19,7 +19,6 @@
 
 import java.nio.file.Path;
 import org.apache.baremaps.tilestore.TileCoord;
-import org.apache.baremaps.tilestore.TileStoreException;
 import org.apache.sis.coverage.grid.*;
 import org.apache.sis.geometry.Envelopes;
 import org.apache.sis.geometry.GeneralEnvelope;
@@ -52,27 +51,27 @@ public class GeoTiffReader implements AutoCloseable {
             Id["EPSG", 3857]]
           """);
     } catch (FactoryException e) {
-      throw new RuntimeException(e);
+      throw new IllegalArgumentException(e);
     }
   }
 
   private final DataStore dataStore;
 
   private final GridCoverage gridCoverage;
 
-  public GeoTiffReader(Path path) {
+  public GeoTiffReader(Path path) throws GeoTiffException {
     try {
       this.dataStore = DataStores.open(path);
       var allImages = ((Aggregate) dataStore).components();
       var firstImage = (GridCoverageResource) allImages.iterator().next();
       firstImage.setLoadingStrategy(RasterLoadingStrategy.AT_GET_TILE_TIME);
       gridCoverage = firstImage.read(null);
     } catch (DataStoreException e) {
-      throw new RuntimeException(e);
+      throw new GeoTiffException(e);
     }
   }
 
-  public double[] read(TileCoord tileCoord, int size, int buffer) throws TileStoreException {
+  public double[] read(TileCoord tileCoord, int size, int buffer) throws GeoTiffException {
     try {
       // Compute the buffer size and expand the envelope
       var fullSize = size + 2 * buffer;
@@ -115,7 +114,7 @@ public double[] read(TileCoord tileCoord, int size, int buffer) throws TileStore
 
       return values;
     } catch (Exception e) {
-      throw new TileStoreException(e);
+      throw new GeoTiffException(e);
     }
   }
 

baremaps-core/src/main/java/org/apache/baremaps/tilestore/raster/TerrariumTileStore.java

@@ -34,17 +34,21 @@ public TerrariumTileStore(GeoTiffReader geoTiffReader) {
 
   @Override
   public BufferedImage read(TileCoord tileCoord) throws TileStoreException {
-    var size = 256;
-    var grid = geoTiffReader.read(tileCoord, size, 0);
-    var bufferedImage = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
-    for (int x = 0; x < size; x++) {
-      for (int y = 0; y < size; y++) {
-        double value = (int) grid[y * size + x];
-        int rgb = ElevationUtils.elevationToTerrarium(value);
-        bufferedImage.setRGB(x, y, rgb);
+    try {
+      var size = 256;
+      var grid = geoTiffReader.read(tileCoord, size, 0);
+      var bufferedImage = new BufferedImage(size, size, BufferedImage.TYPE_INT_RGB);
+      for (int x = 0; x < size; x++) {
+        for (int y = 0; y < size; y++) {
+          double value = (int) grid[y * size + x];
+          int rgb = ElevationUtils.elevationToTerrarium(value);
+          bufferedImage.setRGB(x, y, rgb);
+        }
       }
+      return bufferedImage;
+    } catch (Exception e) {
+      throw new TileStoreException(e);
     }
-    return bufferedImage;
   }
 
   @Override

baremaps-core/src/test/java/org/apache/baremaps/config/TileSetTest.java

@@ -22,7 +22,6 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
 import org.apache.baremaps.maplibre.tilejson.TileJSON;
@@ -35,10 +34,6 @@ public class TileSetTest {
   final ObjectMapper objectMapper = ObjectMapperUtils.objectMapper();
   final ConfigReader configReader = new ConfigReader();
 
-  private File resourceFile(String path) {
-    return new File(TileSetTest.class.getResource(path).getFile());
-  }
-
   @Test
   public void testBasemapJSConfig() throws IOException {
     var path = Path.of("../basemap/tileset.js");

baremaps-dem/src/main/java/org/apache/baremaps/dem/ContourTracer.java

@@ -27,6 +27,7 @@
  * Provides methods for generating contour lines and contour polygons from digital elevation models
  * (DEMs).
  */
+@SuppressWarnings({"squid:S3776", "squid:S135"})
 public class ContourTracer {
 
   private static final GeometryFactory GEOMETRY_FACTORY = new GeometryFactory();
@@ -222,7 +223,6 @@ private static void validateInput(double[] grid, int width, int height) {
    * @param y The y-coordinate of the cell
    * @return A list of line segments
    */
-  @SuppressWarnings("squid:S3776")
   private List<LineString> processCell(double level, int x, int y) {
     List<LineString> segments = new ArrayList<>();
 
@@ -244,7 +244,6 @@ private List<LineString> processCell(double level, int x, int y) {
     double trv = grid[y * width + (x + 1)];
     double brv = grid[(y + 1) * width + (x + 1)];
     double blv = grid[(y + 1) * width + x];
-    double avg = (tlv + trv + brv + blv) / 4.0;
 
     int index =
         (tlv >= level ? 1 : 0) |

baremaps-dem/src/test/java/org/apache/baremaps/dem/ContourTracerTest.java

@@ -27,13 +27,12 @@
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Polygon;
-import org.locationtech.jts.io.ParseException;
 
 class ContourTracerTest {
 
   @Test
   @DisplayName("Test grid normalization")
-  void testGrid1() throws ParseException {
+  void testGrid1() {
     var grid = new double[] {
         0, 0, 0,
         0, 1, 0,

baremaps-dem/src/test/java/org/apache/baremaps/dem/MarchingSquareRenderer.java

@@ -90,7 +90,6 @@ public static void main(String[] args) {
     JFrame frame = new JFrame("Geometry Drawer");
 
     JPanel mainPanel = new JPanel(new GridLayout(4, 4));
-    // mainPanel.setLayout(new BoxLayout(mainPanel, BoxLayout.Y_AXIS));
     for (double[] c : MarchingSquareUtils.CASES) {
 
       List<Geometry> geometries = trace(c)

baremaps-gdal/src/main/java/org/apache/baremaps/gdal/Band.java

@@ -25,42 +25,42 @@
  */
 public class Band implements AutoCloseable {
 
-  private final org.gdal.gdal.Band band;
+  private final org.gdal.gdal.Band gdalBand;
 
-  protected Band(org.gdal.gdal.Band band) {
-    this.band = band;
+  protected Band(org.gdal.gdal.Band gdalBand) {
+    this.gdalBand = gdalBand;
   }
 
   public int getWidth() {
-    return band.getXSize();
+    return gdalBand.getXSize();
   }
 
   public int getHeight() {
-    return band.getYSize();
+    return gdalBand.getYSize();
   }
 
   public void read(int x, int y, int width, int height, byte[] buffer) {
-    band.ReadRaster(x, y, width, height, buffer);
+    gdalBand.ReadRaster(x, y, width, height, buffer);
   }
 
   public void read(int x, int y, int width, int height, int[] buffer) {
-    band.ReadRaster(x, y, width, height, buffer);
+    gdalBand.ReadRaster(x, y, width, height, buffer);
   }
 
   public void read(int x, int y, int width, int height, long[] buffer) {
-    band.ReadRaster(x, y, width, height, buffer);
+    gdalBand.ReadRaster(x, y, width, height, buffer);
   }
 
   public void read(int x, int y, int width, int height, double[] buffer) {
-    band.ReadRaster(x, y, width, height, buffer);
+    gdalBand.ReadRaster(x, y, width, height, buffer);
   }
 
   public BufferedImage asBufferedImage(int imageType) {
     // Copy the data of the band into a byte array
-    int width = band.getXSize();
-    int height = band.getYSize();
+    int width = gdalBand.getXSize();
+    int height = gdalBand.getYSize();
     double[] values = new double[height * width];
-    band.ReadRaster(0, 0, 256, 256, values);
+    gdalBand.ReadRaster(0, 0, 256, 256, values);
 
     // Create a BufferedImage from the byte array
     BufferedImage image = new BufferedImage(width, height, imageType);
@@ -77,7 +77,7 @@ public BufferedImage asBufferedImage(int imageType) {
 
   @Override
   public void close() throws Exception {
-    band.delete();
+    gdalBand.delete();
   }
 
 }

baremaps-gdal/src/main/java/org/apache/baremaps/gdal/Dataset.java

@@ -22,34 +22,34 @@
  */
 public class Dataset implements AutoCloseable {
 
-  protected final org.gdal.gdal.Dataset dataset;
+  protected final org.gdal.gdal.Dataset gdalDataset;
 
-  protected Dataset(org.gdal.gdal.Dataset dataset) {
-    this.dataset = dataset;
+  protected Dataset(org.gdal.gdal.Dataset gdalDataset) {
+    this.gdalDataset = gdalDataset;
   }
 
   public Driver getDriver() {
-    return new Driver(dataset.GetDriver());
+    return new Driver(gdalDataset.GetDriver());
   }
 
   public int getRasterWidth() {
-    return dataset.getRasterXSize();
+    return gdalDataset.getRasterXSize();
   }
 
   public int getRasterHeight() {
-    return dataset.getRasterYSize();
+    return gdalDataset.getRasterYSize();
   }
 
   public int getRasterCount() {
-    return dataset.getRasterCount();
+    return gdalDataset.getRasterCount();
   }
 
   public Band getRasterBand(int index) {
-    return new Band(dataset.GetRasterBand(index));
+    return new Band(gdalDataset.GetRasterBand(index));
   }
 
   @Override
   public void close() throws Exception {
-    dataset.delete();
+    gdalDataset.delete();
   }
 }

baremaps-gdal/src/main/java/org/apache/baremaps/gdal/Driver.java

@@ -22,26 +22,26 @@
  */
 public class Driver implements AutoCloseable {
 
-  private final org.gdal.gdal.Driver driver;
+  private final org.gdal.gdal.Driver gdalDriver;
 
-  protected Driver(org.gdal.gdal.Driver driver) {
-    this.driver = driver;
+  protected Driver(org.gdal.gdal.Driver gdalDriver) {
+    this.gdalDriver = gdalDriver;
   }
 
   public String getShortName() {
-    return driver.getShortName();
+    return gdalDriver.getShortName();
   }
 
   public String getLongName() {
-    return driver.getLongName();
+    return gdalDriver.getLongName();
   }
 
   public String getHelpTopic() {
-    return driver.getHelpTopic();
+    return gdalDriver.getHelpTopic();
   }
 
   @Override
   public void close() throws Exception {
-    driver.delete();
+    gdalDriver.delete();
   }
 }