Fix formatting

apache · Jun 23, 2023 · 5b3b849 · 5b3b849
1 parent bc43970
commit 5b3b849
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 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
@@ -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
@@ -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
@@ -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);
   }
-}
+}