From b97d9d0e795feefb811fb461e4bb18da45c6a36f Mon Sep 17 00:00:00 2001 From: Brandon Liu Date: Mon, 23 Jan 2023 19:06:57 +0800 Subject: [PATCH] fix CloseableConsumer class name (#454) --- .../src/main/java/com/onthegomap/planetiler/VectorTile.java | 2 +- .../onthegomap/planetiler/collection/ExternalMergeSort.java | 6 +++--- .../com/onthegomap/planetiler/collection/FeatureGroup.java | 4 ++-- .../com/onthegomap/planetiler/collection/FeatureSort.java | 6 +++--- .../util/{CloseableConusmer.java => CloseableConsumer.java} | 2 +- .../onthegomap/planetiler/collection/FeatureGroupTest.java | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) rename planetiler-core/src/main/java/com/onthegomap/planetiler/util/{CloseableConusmer.java => CloseableConsumer.java} (77%) diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java index 4557a6c6..bed7c518 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/VectorTile.java @@ -554,7 +554,7 @@ public class VectorTile { } /** - * A vector tile encoded as a list of commands according to the + * A vector geometry encoded as a list of commands according to the * vector tile * specification. *

diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java index 43e8c8e8..05ba1db7 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/ExternalMergeSort.java @@ -9,7 +9,7 @@ import com.onthegomap.planetiler.stats.Stats; import com.onthegomap.planetiler.stats.Timer; import com.onthegomap.planetiler.util.BinPack; import com.onthegomap.planetiler.util.ByteBufferUtil; -import com.onthegomap.planetiler.util.CloseableConusmer; +import com.onthegomap.planetiler.util.CloseableConsumer; import com.onthegomap.planetiler.util.FileUtils; import com.onthegomap.planetiler.worker.WorkerPipeline; import java.io.BufferedInputStream; @@ -138,7 +138,7 @@ class ExternalMergeSort implements FeatureSort { } @Override - public CloseableConusmer writerForThread() { + public CloseableConsumer writerForThread() { return new ThreadLocalWriter(); } @@ -396,7 +396,7 @@ class ExternalMergeSort implements FeatureSort { /** Writer that a single thread can use to write features independent of writers used in other threads. */ @NotThreadSafe - private class ThreadLocalWriter implements CloseableConusmer { + private class ThreadLocalWriter implements CloseableConsumer { private Chunk currentChunk; diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java index a2b51075..ee0be0e4 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureGroup.java @@ -9,7 +9,7 @@ import com.onthegomap.planetiler.geo.GeometryType; import com.onthegomap.planetiler.geo.TileCoord; import com.onthegomap.planetiler.render.RenderedFeature; import com.onthegomap.planetiler.stats.Stats; -import com.onthegomap.planetiler.util.CloseableConusmer; +import com.onthegomap.planetiler.util.CloseableConsumer; import com.onthegomap.planetiler.util.CommonStringEncoder; import com.onthegomap.planetiler.util.DiskBacked; import com.onthegomap.planetiler.util.LayerStats; @@ -243,7 +243,7 @@ public final class FeatureGroup implements Iterable, } /** Returns a new feature writer that can be used for a single thread. */ - public CloseableConusmer writerForThread() { + public CloseableConsumer writerForThread() { return sorter.writerForThread(); } diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureSort.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureSort.java index b9fbeb38..c209c89f 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureSort.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/collection/FeatureSort.java @@ -1,7 +1,7 @@ package com.onthegomap.planetiler.collection; import com.onthegomap.planetiler.stats.Stats; -import com.onthegomap.planetiler.util.CloseableConusmer; +import com.onthegomap.planetiler.util.CloseableConsumer; import com.onthegomap.planetiler.util.DiskBacked; import com.onthegomap.planetiler.util.MemoryEstimator; import com.onthegomap.planetiler.worker.WeightedHandoffQueue; @@ -45,7 +45,7 @@ interface FeatureSort extends Iterable, DiskBacked, MemoryEstim } @Override - public CloseableConusmer writerForThread() { + public CloseableConsumer writerForThread() { return list::add; } @@ -94,7 +94,7 @@ interface FeatureSort extends Iterable, DiskBacked, MemoryEstim * Returns a new writer that can be used to write features from a single thread independent of writers used from other * threads. */ - CloseableConusmer writerForThread(); + CloseableConsumer writerForThread(); @Override default Iterator iterator() { diff --git a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CloseableConusmer.java b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CloseableConsumer.java similarity index 77% rename from planetiler-core/src/main/java/com/onthegomap/planetiler/util/CloseableConusmer.java rename to planetiler-core/src/main/java/com/onthegomap/planetiler/util/CloseableConsumer.java index a33c6d8d..49a6d627 100644 --- a/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CloseableConusmer.java +++ b/planetiler-core/src/main/java/com/onthegomap/planetiler/util/CloseableConsumer.java @@ -5,7 +5,7 @@ import java.io.IOException; import java.util.function.Consumer; @FunctionalInterface -public interface CloseableConusmer extends Consumer, Closeable { +public interface CloseableConsumer extends Consumer, Closeable { @Override default void close() throws IOException {} diff --git a/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/FeatureGroupTest.java b/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/FeatureGroupTest.java index 2808730a..a2a67912 100644 --- a/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/FeatureGroupTest.java +++ b/planetiler-core/src/test/java/com/onthegomap/planetiler/collection/FeatureGroupTest.java @@ -14,7 +14,7 @@ import com.onthegomap.planetiler.geo.GeometryType; import com.onthegomap.planetiler.geo.TileCoord; import com.onthegomap.planetiler.render.RenderedFeature; import com.onthegomap.planetiler.stats.Stats; -import com.onthegomap.planetiler.util.CloseableConusmer; +import com.onthegomap.planetiler.util.CloseableConsumer; import com.onthegomap.planetiler.util.Gzip; import com.onthegomap.planetiler.writer.TileArchiveWriter; import java.io.IOException; @@ -40,7 +40,7 @@ class FeatureGroupTest { private final FeatureSort sorter = FeatureSort.newInMemory(); private FeatureGroup features = new FeatureGroup(sorter, new Profile.NullProfile(), Stats.inMemory()); - private CloseableConusmer featureWriter = features.writerForThread(); + private CloseableConsumer featureWriter = features.writerForThread(); @Test void testEmpty() {