Changeset 18698 in josm for trunk

Timestamp:

2023-03-21T14:21:54+01:00 (21 months ago)

Author:

taylor.smock

Message:

See r18695, #22603: Drop optional compression support

We don't include LZMA or Zstd decompressors in the dist-optimized build.

File:

• trunk/src/org/openstreetmap/josm/data/osm/pbf/Blob.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/osm/pbf/Blob.java

@@ -11 +11 @@
 
 import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream;
-import org.apache.commons.compress.compressors.lzma.LZMACompressorInputStream;
-import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
 
 /**
@@ -19 +17 @@
  */
 public final class Blob {
+    /** The compression types for the blob */
     public enum CompressionType {
         /** No compression */
@@ -37 +36 @@
     private final CompressionType compressionType;
     private final byte[] bytes;
+
+    /**
+     * Create a new blob
+     * @param rawSize The blob size
+     * @param compressionType The compression type
+     * @param bytes The bytes of the blob
+     */
     public Blob(@Nullable Integer rawSize, @Nonnull CompressionType compressionType, @Nonnull byte... bytes) {
         this.rawSize = rawSize;
@@ -75 +81 @@
      * @throws IOException if we don't support the compression type <i>or</i> the decompressor has issues, see
      * <ul>
-     *     <li>{@link LZMACompressorInputStream}</li>
-     *     <li>{@link ZstdCompressorInputStream}</li>
      *     <li>{@link BZip2CompressorInputStream}</li>
      * </ul>
@@ -86 +90 @@
             case raw:
                 return bais;
-            case lzma:
-                return new LZMACompressorInputStream(bais);
-            case zstd:
-                return new ZstdCompressorInputStream(bais);
             case bzip2:
                 return new BZip2CompressorInputStream(bais);
+            case lzma:
+            case zstd:
             case lz4:
-                throw new IOException("lz4 pbf is not currently supported");
+                throw new IOException(this.compressionType + " pbf is not currently supported");
             case zlib:
                 return new InflaterInputStream(bais);