From 5b3b849d999ac6d087f190d78c674fd2b945083f Mon Sep 17 00:00:00 2001
From: Bertil Chapuis <bchapuis@gmail.com>
Date: Fri, 23 Jun 2023 14:20:42 +0200
Subject: [PATCH] Fix formatting

---
 .../baremaps/benchmarks/MBTilesBenchmark.java  |  2 --
 .../java/org/apache/baremaps/cli/map/Map.java  |  3 ++-
 .../apache/baremaps/tilestore/TileCache.java   | 18 +++---------------
 3 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/baremaps-benchmark/src/main/java/org/apache/baremaps/benchmarks/MBTilesBenchmark.java b/baremaps-benchmark/src/main/java/org/apache/baremaps/benchmarks/MBTilesBenchmark.java
index d8021f7f6..61c81265e 100644
--- a/baremaps-benchmark/src/main/java/org/apache/baremaps/benchmarks/MBTilesBenchmark.java
+++ b/baremaps-benchmark/src/main/java/org/apache/baremaps/benchmarks/MBTilesBenchmark.java
@@ -93,6 +93,4 @@ public static void main(String[] args) throws RunnerException {
         new OptionsBuilder().include(MBTilesBenchmark.class.getSimpleName()).forks(1).build();
     new Runner(opt).run();
   }
-
-
 }
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 c7640b8b1..4fed8fe98 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
@@ -18,7 +18,8 @@
 import picocli.CommandLine.Command;
 
 @Command(name = "map", description = "Map commands.",
-    subcommands = {Init.class, Export.class, Serve.class, Dev.class, StyleCommand.class, MBTiles.class},
+    subcommands = {Init.class, Export.class, Serve.class, Dev.class, StyleCommand.class,
+        MBTiles.class},
     sortOptions = false)
 public class Map implements Runnable {
 
diff --git a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
index d6b2fa334..6e0377907 100644
--- a/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
+++ b/baremaps-core/src/main/java/org/apache/baremaps/tilestore/TileCache.java
@@ -50,22 +50,10 @@ public TileCache(TileStore tileStore, CaffeineSpec spec) {
 
   /** {@inheritDoc} */
   @Override
-<<<<<<< HEAD
-  public ByteBuffer get(TileCoord tileCoord) throws TileStoreException {
-    var buffer = cache.get(tileCoord, t -> {
-      try {
-        return tileStore.get(t);
-=======
   public ByteBuffer read(TileCoord tileCoord) throws TileStoreException {
-    return cache.get(tileCoord, t -> {
+    var buffer = cache.get(tileCoord, t -> {
       try {
-        var buffer = tileStore.read(t);
-        if (buffer == null) {
-          return null;
-        } else {
-          return buffer;
-        }
->>>>>>> 1d7ffeec (Change the TileStore interface)
+        return tileStore.read(t);
       } catch (TileStoreException e) {
         logger.error("Unable to read the tile.", e);
         return null;
@@ -91,4 +79,4 @@ public void delete(TileCoord tileCoord) throws TileStoreException {
     tileStore.delete(tileCoord);
     cache.invalidate(tileCoord);
   }
-}
\ No newline at end of file
+}