mirror
/
s3proxy
kopia lustrzana https://github.com/gaul/s3proxy
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Use switch expressions where possible

pull/902/head
Andrew Gaul 2025-10-11 16:54:55 -07:00
rodzic 7cbc1872c4
commit dfe423f861
2 zmienionych plików z 18 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
src/main/java/org/gaul/s3proxy/ChunkedInputStream.java
Wyświetl plik

@ -76,21 +76,12 @@ final class ChunkedInputStream extends FilterInputStream {
if (parts[0].startsWith("x-amz-checksum-")) {
String[] checksumParts = parts[0].split(":", 2);
var expectedHash = checksumParts[1];
String actualHash;
switch (checksumParts[0]) {
case "x-amz-checksum-crc32":
case "x-amz-checksum-crc32c":
// Use big-endian to match AWS
actualHash = Base64.getEncoder().encodeToString(ByteBuffer.allocate(4).putInt(hasher.hash().asInt()).array());
break;
case "x-amz-checksum-sha1":
case "x-amz-checksum-sha256":
actualHash = Base64.getEncoder().encodeToString(hasher.hash().asBytes());
break;
default:
throw new IllegalArgumentException("Unknown value: " + checksumParts[0]);
}
if (!expectedHash.equals(actualHash)) {
var actualHash = switch (checksumParts[0]) {
case "x-amz-checksum-crc32", "x-amz-checksum-crc32c" -> ByteBuffer.allocate(4).putInt(hasher.hash().asInt()).array(); // Use big-endian to match AWS
case "x-amz-checksum-sha1", "x-amz-checksum-sha256" -> hasher.hash().asBytes();
default -> throw new IllegalArgumentException("Unknown value: " + checksumParts[0]);
};
if (!expectedHash.equals(Base64.getEncoder().encodeToString(actualHash))) {
throw new IOException(new S3Exception(S3ErrorCode.BAD_DIGEST));
}
currentLength = 0;

28
src/main/java/org/gaul/s3proxy/azureblob/AzureBlobStore.java
Wyświetl plik

@ -224,11 +224,11 @@ public final class AzureBlobStore extends BaseBlobStore {
var response = blobServiceClient
.createBlobContainerIfNotExistsWithResponse(
container, azureOptions, /*context=*/ null);
switch (response.getStatusCode()) {
case 201: return true;
case 409: return false;
default: return false;
}
return switch (response.getStatusCode()) {
case 201 -> true;
case 409 -> false;
default -> false;
};
} catch (BlobStorageException bse) {
translateAndRethrowException(bse, container, /*key=*/ null);
throw bse;
@ -683,17 +683,13 @@ public final class AzureBlobStore extends BaseBlobStore {
}
private static AccessTier toAccessTier(Tier tier) {
switch (tier) {
case ARCHIVE:
return AccessTier.ARCHIVE;
case COOL:
return AccessTier.COOL;
case COLD:
return AccessTier.COLD;
case STANDARD:
default:
return AccessTier.HOT;
}
return switch (tier) {
case ARCHIVE -> AccessTier.ARCHIVE;
case COOL -> AccessTier.COOL;
case INFREQUENT -> AccessTier.COOL;
case COLD -> AccessTier.COLD;
case STANDARD -> AccessTier.HOT;
};
}
private static Tier toTier(AccessTier tier) {