From 42d84d505e975ca7282b0bca1bdf4f7990fb2312 Mon Sep 17 00:00:00 2001 From: DongHyeonka Date: Fri, 13 Nov 2026 07:10:55 +0900 Subject: [PATCH] =?UTF-8?q?fix(objectstorage):=20=EB=B6=88=EB=B3=80=20Set?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=A7=8C=EB=93=A0=20=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=EC=97=90=EC=84=9C=20NPE=EB=A5=BC=20=EB=82=B4=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 문제: ObjectRequestSupport.immutableCapabilities가 null 원소를 거르려고 capabilities.contains(null)을 불렀다. JDK의 불변 Set(Set.of, Set.copyOf)은 contains(null)에서 false 대신 NullPointerException을 던진다. 그래서 게시·stage 요청을 Set.of(...) capability로 만들면 생성자가 NPE로 실패했다. 지금 호출자가 모두 EnumSet을 넘겨 드러나지 않았고, 포트 계약 시험(다음 커밋)이 처음 잡았다. 고친 것: 원소를 하나씩 보고 null이면 지금처럼 IllegalArgumentException을 던진다. 검증: desktop, 기준 4ca61cd9에 새 시험만 → 「불변 Set으로 만든 요청」이 NPE로 실패. 고친 뒤 :application-objectstorage:check 통과(다음 커밋의 GREEN 실행에 포함). Refs: RR9-03-33 --- .../request/ObjectRequestSupport.java | 8 +- .../ObjectRequestCapabilitiesTest.java | 77 +++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 src/application/objectstorage/src/test/java/dev/caskeleton/application/objectstorage/request/ObjectRequestCapabilitiesTest.java diff --git a/src/application/objectstorage/src/main/java/dev/caskeleton/application/objectstorage/request/ObjectRequestSupport.java b/src/application/objectstorage/src/main/java/dev/caskeleton/application/objectstorage/request/ObjectRequestSupport.java index 2a25b28e..02b02c77 100644 --- a/src/application/objectstorage/src/main/java/dev/caskeleton/application/objectstorage/request/ObjectRequestSupport.java +++ b/src/application/objectstorage/src/main/java/dev/caskeleton/application/objectstorage/request/ObjectRequestSupport.java @@ -18,8 +18,12 @@ final class ObjectRequestSupport { static Set immutableCapabilities( Set capabilities) { required(capabilities, "capabilities"); - if (capabilities.contains(null)) { - throw new IllegalArgumentException("capabilities must not contain null"); + // Each element, not contains(null): an immutable Set (Set.of, Set.copyOf) throws + // NullPointerException from contains(null) instead of answering false. + for (ObjectCapabilityRequirement capability : capabilities) { + if (capability == null) { + throw new IllegalArgumentException("capabilities must not contain null"); + } } return Set.copyOf(capabilities); } diff --git a/src/application/objectstorage/src/test/java/dev/caskeleton/application/objectstorage/request/ObjectRequestCapabilitiesTest.java b/src/application/objectstorage/src/test/java/dev/caskeleton/application/objectstorage/request/ObjectRequestCapabilitiesTest.java new file mode 100644 index 00000000..5ee9fbbb --- /dev/null +++ b/src/application/objectstorage/src/test/java/dev/caskeleton/application/objectstorage/request/ObjectRequestCapabilitiesTest.java @@ -0,0 +1,77 @@ +package dev.caskeleton.application.objectstorage.request; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchThrowable; + +import dev.caskeleton.application.objectstorage.content.CallBudget; +import dev.caskeleton.application.objectstorage.content.CancellationView; +import dev.caskeleton.application.objectstorage.identity.ObjectDestinationId; +import dev.caskeleton.application.objectstorage.identity.ObjectOperationEpoch; +import dev.caskeleton.application.objectstorage.identity.ObjectOperationId; +import dev.caskeleton.application.objectstorage.identity.ObjectOperationKey; +import dev.caskeleton.application.objectstorage.model.ObjectCapabilityRequirement; +import dev.caskeleton.application.objectstorage.model.ObjectContentIdentity; +import dev.caskeleton.application.objectstorage.model.ObjectDigest; +import dev.caskeleton.application.objectstorage.model.ObjectEncryptionRequirement; +import dev.caskeleton.application.objectstorage.model.ObjectMediaType; +import dev.caskeleton.application.objectstorage.model.ObjectPublicationRequirement; +import dev.caskeleton.application.objectstorage.model.ObjectRetentionRequirement; +import java.time.Duration; +import java.util.HashSet; +import java.util.Set; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +/** The capability set a publish or stage request carries. */ +class ObjectRequestCapabilitiesTest { + + @Test + @DisplayName("불변 Set으로 만든 요청도 그 capability를 그대로 담는다") + void anImmutableCapabilitySetIsAccepted() { + // given + Set capabilities = + Set.of(ObjectCapabilityRequirement.IMMUTABLE_CREATE); + + // when + ObjectPublishRequest request = publishRequest(capabilities); + + // then + assertThat(request.capabilityRequirements()) + .containsExactly(ObjectCapabilityRequirement.IMMUTABLE_CREATE); + } + + @Test + @DisplayName("null을 담은 capability Set은 거절한다") + void aCapabilitySetHoldingNullIsRefused() { + // given + Set capabilities = new HashSet<>(); + capabilities.add(ObjectCapabilityRequirement.IMMUTABLE_CREATE); + capabilities.add(null); + + // when + Throwable refused = catchThrowable(() -> publishRequest(capabilities)); + + // then + assertThat(refused) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("capabilities must not contain null"); + } + + private static ObjectPublishRequest publishRequest( + Set capabilities) { + byte[] content = {1, 2, 3}; + return new ObjectPublishRequest( + new ObjectOperationKey( + ObjectDestinationId.of("poster"), + ObjectOperationEpoch.of("epoch-a"), + ObjectOperationId.of("operation-a")), + ObjectMediaType.of("application/octet-stream"), + new ObjectContentIdentity(content.length, ObjectDigest.sha256(content)), + ObjectPublicationRequirement.INTEGRITY_VERIFIED, + ObjectRetentionRequirement.NONE, + ObjectEncryptionRequirement.PROVIDER_MANAGED, + capabilities, + CallBudget.fromNow(Duration.ofMinutes(1)), + CancellationView.never()); + } +}