Skip to content

Commit 47785ab

Browse files
committed
refactor: Remove delete legacy Stream versions
1 parent 7d3c06c commit 47785ab

File tree

7 files changed

+13
-360
lines changed

7 files changed

+13
-360
lines changed

src/main/java/dev/hallock/zstd/ZstdCompressionContext.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ public ZstdCompressionContext() {
1212
this.cctx = ZSTD_h.ZSTD_createCCtx();
1313
}
1414

15+
/// @apiNote Uses compress2
1516
public ZstdResult compress(MemorySegment dst, long dstCapacity, MemorySegment src, long srcSize) {
1617
Objects.requireNonNull(dst, "dst");
1718
if (dstCapacity > dst.byteSize())
@@ -22,6 +23,7 @@ public ZstdResult compress(MemorySegment dst, long dstCapacity, MemorySegment sr
2223
return ZstdResult.from(ZSTD_h.ZSTD_compress2(this.cctx, dst, dstCapacity, src, srcSize));
2324
}
2425

26+
/// @apiNote Uses compressStream2
2527
public ZstdResult compressStream(ZstdOutputBuffer output, ZstdInputBuffer input, ZstdEndDirective endDirective) {
2628
Objects.requireNonNull(output, "output");
2729
Objects.requireNonNull(input, "input");

src/main/java/dev/hallock/zstd/ZstdCompressionStream.java

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/main/java/dev/hallock/zstd/ZstdDecompressionContext.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@ public ZstdResult parameter(ZstdDecompressionParameter parameter, int value) {
4848
return ZstdResult.from(ZSTD_h.ZSTD_DCtx_setParameter(this.dctx, parameter.value(), value));
4949
}
5050

51+
public ZstdResult decompressStream(ZstdOutputBuffer outBuf, ZstdInputBuffer inBuf) {
52+
Objects.requireNonNull(outBuf, "outBuf");
53+
Objects.requireNonNull(inBuf, "inBuf");
54+
return ZstdResult.from(ZSTD_h.ZSTD_decompressStream(this.dctx, outBuf.output(), inBuf.input()));
55+
}
56+
5157
@Override
5258
public void close() throws ZstdException {
5359
ZstdResult.check(ZSTD_h.ZSTD_freeDCtx(this.dctx));

src/main/java/dev/hallock/zstd/ZstdDecompressionStream.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/test/java/dev/hallock/zstd/test/ZstdBufferTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ void testOutputBufferOperations() {
4545
@Test
4646
void testInputBufferInStream() throws Exception {
4747
try (Arena arena = Arena.ofConfined();
48-
ZstdCompressionStream stream = new ZstdCompressionStream(Zstd.defaultCompressionLevel())) {
48+
ZstdCompressionContext stream = new ZstdCompressionContext()) {
49+
stream.parameter(ZstdCompressionParameter.COMPRESSION_LEVEL, Zstd.defaultCompressionLevel());
4950

5051
MemorySegment input = arena.allocate(1000);
5152
MemorySegment output = arena.allocate(2000);
@@ -57,7 +58,7 @@ void testInputBufferInStream() throws Exception {
5758
inBuf.position(0);
5859
outBuf.position(0);
5960

60-
stream.compressionStream(outBuf, inBuf);
61+
stream.compressStream(outBuf, inBuf, ZstdEndDirective.END);
6162

6263
assertTrue(inBuf.position() >= 0);
6364
assertTrue(outBuf.position() >= 0);
@@ -67,7 +68,7 @@ void testInputBufferInStream() throws Exception {
6768
@Test
6869
void testOutputBufferInStream() throws Exception {
6970
try (Arena arena = Arena.ofConfined();
70-
ZstdDecompressionStream stream = new ZstdDecompressionStream()) {
71+
ZstdDecompressionContext stream = new ZstdDecompressionContext()) {
7172

7273
byte[] compressedData = compressTestData();
7374
MemorySegment input = arena.allocate(compressedData.length);
@@ -82,7 +83,7 @@ void testOutputBufferInStream() throws Exception {
8283
outBuf.position(0);
8384
outBuf.size(1000);
8485

85-
stream.decompressStream(outBuf, inBuf);
86+
assertInstanceOf(ZstdResult.Ok.class, stream.decompressStream(outBuf, inBuf));
8687

8788
assertTrue(outBuf.position() > 0);
8889
}

src/test/java/dev/hallock/zstd/test/ZstdStreamCoverageTest.java

Lines changed: 0 additions & 94 deletions
This file was deleted.

0 commit comments

Comments
 (0)