throw appropriate exception when the partition key is null

agorapulse · Jun 27, 2024 · ba2b3fe · ba2b3fe
1 parent 7457d8a
commit ba2b3fe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 0 deletions.
diff --git a/...ain/java/com/agorapulse/micronaut/amazon/awssdk/dynamodb/DefaultAsyncDynamoDbService.java b/...ain/java/com/agorapulse/micronaut/amazon/awssdk/dynamodb/DefaultAsyncDynamoDbService.java
@@ -346,6 +346,11 @@ private T postLoad(T i) {
 
     private <R> R doWithKey(Object partitionKey, Object sortKey, Function<Key, R> function) {
         String hashKeyName = table.tableSchema().tableMetadata().primaryPartitionKey();
+
+        if (partitionKey == null) {
+            throw new IllegalArgumentException("Partition key " + hashKeyName + " cannot be null");
+        }
+
         AttributeValue partitionKeyValue = attributeConversionHelper.convert(table, hashKeyName, partitionKey);
 
         if (sortKey == null) {
@@ -364,6 +369,11 @@ private <R> R doWithKey(Object partitionKey, Object sortKey, Function<Key, R> fu
 
     private <R> Publisher<R> doWithKeys(Object partitionKey, Publisher<?> sortKeys, BiFunction<AttributeValue, Publisher<AttributeValue>, Publisher<R>> function) {
         String hashKeyName = table.tableSchema().tableMetadata().primaryPartitionKey();
+
+        if (partitionKey == null) {
+            throw new IllegalArgumentException("Partition key " + hashKeyName + " cannot be null");
+        }
+
         AttributeValue partitionKeyValue = attributeConversionHelper.convert(table, hashKeyName, partitionKey);
 
         Optional<String> sortKeyName = table.tableSchema().tableMetadata().primarySortKey();

diff --git a/...src/main/java/com/agorapulse/micronaut/amazon/awssdk/dynamodb/DefaultDynamoDbService.java b/...src/main/java/com/agorapulse/micronaut/amazon/awssdk/dynamodb/DefaultDynamoDbService.java
@@ -345,6 +345,11 @@ private T postLoad(T i) {
 
     private <R> R doWithKey(Object partitionKey, Object sortKey, Function<Key, R> function) {
         String hashKeyName = table.tableSchema().tableMetadata().primaryPartitionKey();
+
+        if (partitionKey == null) {
+            throw new IllegalArgumentException("Partition key " + hashKeyName + " cannot be null");
+        }
+
         AttributeValue partitionKeyValue = attributeConversionHelper.convert(table, hashKeyName, partitionKey);
 
         if (sortKey == null) {
@@ -363,6 +368,11 @@ private <R> R doWithKey(Object partitionKey, Object sortKey, Function<Key, R> fu
 
     private <R> Publisher<R> doWithKeys(Object partitionKey, Publisher<?> sortKeys, BiFunction<AttributeValue, Publisher<AttributeValue>, Publisher<R>> function) {
         String hashKeyName = table.tableSchema().tableMetadata().primaryPartitionKey();
+
+        if (partitionKey == null) {
+            throw new IllegalArgumentException("Partition key " + hashKeyName + " cannot be null");
+        }
+
         AttributeValue partitionKeyValue = attributeConversionHelper.convert(table, hashKeyName, partitionKey);
 
         Optional<String> sortKeyName = table.tableSchema().tableMetadata().primarySortKey();

diff --git a/...om/agorapulse/micronaut/amazon/awssdk/dynamodb/AdvancedQueryOnDeclarativeServiceTest.java b/...om/agorapulse/micronaut/amazon/awssdk/dynamodb/AdvancedQueryOnDeclarativeServiceTest.java
@@ -47,6 +47,8 @@ public void testJavaService() {
         assertNotNull(s.save(createEntity("1", "6", "foo", null, Date.from(REFERENCE_DATE.plus(3, ChronoUnit.DAYS)))));
         assertNotNull(s.save(createEntity("2", "1", "bar", 3, Date.from(REFERENCE_DATE))));
 
+        assertThrowsExactly(IllegalArgumentException.class, () -> s.get(null, "1"));
+
         assertEquals(2, s.countAllByNumber("1", 1));
         assertEquals(1, s.countAllByNumber("1", null));
         assertEquals(6, s.countAllByOptionalNumber("1", null));