Skip to content

Commit fbdccd0

Browse files
committed
finish merge update dependency versions
1 parent 4448011 commit fbdccd0

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/main/java/dev/zarr/zarrjava/v3/codec/core/ZstdCodec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public ZstdCodec(
2828
public ByteBuffer decode(ByteBuffer compressedBytes) throws ZarrException {
2929
byte[] compressedArray = compressedBytes.array();
3030

31-
long originalSize = Zstd.decompressedSize(compressedArray);
31+
long originalSize = Zstd.getFrameContentSize(compressedArray);
3232
if (originalSize == 0) {
3333
throw new ZarrException("Failed to get decompressed size");
3434
}

src/test/java/dev/zarr/zarrjava/ZarrPythonTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ public void testZstdLibrary(int clevel, boolean checksumFlag) throws IOException
265265
compressed = ctx.compress(src);
266266
}
267267
//decompress with Zstd.decompress
268-
long originalSize = Zstd.decompressedSize(compressed);
268+
long originalSize = Zstd.getFrameContentSize(compressed);
269269
byte[] decompressed = Zstd.decompress(compressed, (int) originalSize);
270270
Assertions.assertEquals(number, ByteBuffer.wrap(decompressed).getInt());
271271

src/test/java/dev/zarr/zarrjava/ZarrV3Test.java

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package dev.zarr.zarrjava;
22

3-
import com.amazonaws.auth.AWSStaticCredentialsProvider;
4-
import com.amazonaws.auth.AnonymousAWSCredentials;
5-
import com.amazonaws.services.s3.AmazonS3ClientBuilder;
3+
import software.amazon.awssdk.auth.credentials.AnonymousCredentialsProvider;
4+
import software.amazon.awssdk.regions.Region;
5+
import software.amazon.awssdk.services.s3.S3Client;
6+
67
import com.fasterxml.jackson.databind.JsonMappingException;
78
import com.fasterxml.jackson.databind.ObjectMapper;
89
import dev.zarr.zarrjava.core.Node;
@@ -225,9 +226,9 @@ public void testFileSystemStores() throws IOException, ZarrException {
225226

226227
@Test
227228
public void testS3Store() throws IOException, ZarrException {
228-
S3Store s3Store = new S3Store(AmazonS3ClientBuilder.standard()
229-
.withRegion("eu-west-1")
230-
.withCredentials(new AWSStaticCredentialsProvider(new AnonymousAWSCredentials()))
229+
S3Store s3Store = new S3Store(S3Client.builder()
230+
.region(Region.of("eu-west-1"))
231+
.credentialsProvider(AnonymousCredentialsProvider.create())
231232
.build(), "static.webknossos.org", "data");
232233
System.out.println(Array.open(s3Store.resolve("zarr_v3", "l4_sample", "color", "1")));
233234
}

0 commit comments

Comments
 (0)