Skip to content

Commit c5e3331

Browse files
ianbotsfianbotsf
committed
fix accidental inclusion of expression attribute members in high-level DynamoDB Mapper requests
1 parent 5a1c004 commit c5e3331

File tree

2 files changed

+1
-28
lines changed
  • hll/dynamodb-mapper

2 files changed

+1
-28
lines changed

‎hll/dynamodb-mapper/dynamodb-mapper-ops-codegen/src/main/kotlin/aws/sdk/kotlin/hll/dynamodbmapper/codegen/operations/model/Structure.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ internal fun Structure.toHighLevel(pkg: String): Structure {
2121
val nullable = llMember.type.nullable
2222

2323
val hlMember = when (val behavior = llMember.codegenBehavior) {
24-
MemberCodegenBehavior.PassThrough, is MemberCodegenBehavior.ExpressionArguments -> llMember
24+
MemberCodegenBehavior.PassThrough -> llMember
2525

2626
MemberCodegenBehavior.MapAll, MemberCodegenBehavior.MapKeys ->
2727
llMember.copy(type = TypeVar("T", nullable))

‎hll/dynamodb-mapper/dynamodb-mapper/api/dynamodb-mapper.api‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -828,8 +828,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemKt {
828828

829829
public abstract interface class aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemRequest {
830830
public static final field Companion Laws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemRequest$Companion;
831-
public abstract fun getExpressionAttributeNames ()Ljava/util/Map;
832-
public abstract fun getExpressionAttributeValues ()Ljava/util/Map;
833831
public abstract fun getKey ()Ljava/lang/Object;
834832
public abstract fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
835833
public abstract fun getReturnItemCollectionMetrics ()Laws/sdk/kotlin/services/dynamodb/model/ReturnItemCollectionMetrics;
@@ -843,15 +841,11 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemReques
843841
public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemRequestBuilder {
844842
public fun <init> ()V
845843
public final fun build ()Laws/sdk/kotlin/hll/dynamodbmapper/operations/DeleteItemRequest;
846-
public final fun getExpressionAttributeNames ()Ljava/util/Map;
847-
public final fun getExpressionAttributeValues ()Ljava/util/Map;
848844
public final fun getKey ()Ljava/lang/Object;
849845
public final fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
850846
public final fun getReturnItemCollectionMetrics ()Laws/sdk/kotlin/services/dynamodb/model/ReturnItemCollectionMetrics;
851847
public final fun getReturnValues ()Laws/sdk/kotlin/services/dynamodb/model/ReturnValue;
852848
public final fun getReturnValuesOnConditionCheckFailure ()Laws/sdk/kotlin/services/dynamodb/model/ReturnValuesOnConditionCheckFailure;
853-
public final fun setExpressionAttributeNames (Ljava/util/Map;)V
854-
public final fun setExpressionAttributeValues (Ljava/util/Map;)V
855849
public final fun setKey (Ljava/lang/Object;)V
856850
public final fun setReturnConsumedCapacity (Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;)V
857851
public final fun setReturnItemCollectionMetrics (Laws/sdk/kotlin/services/dynamodb/model/ReturnItemCollectionMetrics;)V
@@ -892,7 +886,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemKt {
892886
public abstract interface class aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemRequest {
893887
public static final field Companion Laws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemRequest$Companion;
894888
public abstract fun getConsistentRead ()Ljava/lang/Boolean;
895-
public abstract fun getExpressionAttributeNames ()Ljava/util/Map;
896889
public abstract fun getKey ()Ljava/lang/Object;
897890
public abstract fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
898891
}
@@ -904,11 +897,9 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemRequestBu
904897
public fun <init> ()V
905898
public final fun build ()Laws/sdk/kotlin/hll/dynamodbmapper/operations/GetItemRequest;
906899
public final fun getConsistentRead ()Ljava/lang/Boolean;
907-
public final fun getExpressionAttributeNames ()Ljava/util/Map;
908900
public final fun getKey ()Ljava/lang/Object;
909901
public final fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
910902
public final fun setConsistentRead (Ljava/lang/Boolean;)V
911-
public final fun setExpressionAttributeNames (Ljava/util/Map;)V
912903
public final fun setKey (Ljava/lang/Object;)V
913904
public final fun setReturnConsumedCapacity (Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;)V
914905
}
@@ -970,8 +961,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemKt {
970961

971962
public abstract interface class aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemRequest {
972963
public static final field Companion Laws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemRequest$Companion;
973-
public abstract fun getExpressionAttributeNames ()Ljava/util/Map;
974-
public abstract fun getExpressionAttributeValues ()Ljava/util/Map;
975964
public abstract fun getItem ()Ljava/lang/Object;
976965
public abstract fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
977966
public abstract fun getReturnItemCollectionMetrics ()Laws/sdk/kotlin/services/dynamodb/model/ReturnItemCollectionMetrics;
@@ -985,15 +974,11 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemRequest$C
985974
public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemRequestBuilder {
986975
public fun <init> ()V
987976
public final fun build ()Laws/sdk/kotlin/hll/dynamodbmapper/operations/PutItemRequest;
988-
public final fun getExpressionAttributeNames ()Ljava/util/Map;
989-
public final fun getExpressionAttributeValues ()Ljava/util/Map;
990977
public final fun getItem ()Ljava/lang/Object;
991978
public final fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
992979
public final fun getReturnItemCollectionMetrics ()Laws/sdk/kotlin/services/dynamodb/model/ReturnItemCollectionMetrics;
993980
public final fun getReturnValues ()Laws/sdk/kotlin/services/dynamodb/model/ReturnValue;
994981
public final fun getReturnValuesOnConditionCheckFailure ()Laws/sdk/kotlin/services/dynamodb/model/ReturnValuesOnConditionCheckFailure;
995-
public final fun setExpressionAttributeNames (Ljava/util/Map;)V
996-
public final fun setExpressionAttributeValues (Ljava/util/Map;)V
997982
public final fun setItem (Ljava/lang/Object;)V
998983
public final fun setReturnConsumedCapacity (Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;)V
999984
public final fun setReturnItemCollectionMetrics (Laws/sdk/kotlin/services/dynamodb/model/ReturnItemCollectionMetrics;)V
@@ -1035,8 +1020,6 @@ public abstract interface class aws/sdk/kotlin/hll/dynamodbmapper/operations/Que
10351020
public static final field Companion Laws/sdk/kotlin/hll/dynamodbmapper/operations/QueryRequest$Companion;
10361021
public abstract fun getConsistentRead ()Ljava/lang/Boolean;
10371022
public abstract fun getExclusiveStartKey ()Ljava/lang/Object;
1038-
public abstract fun getExpressionAttributeNames ()Ljava/util/Map;
1039-
public abstract fun getExpressionAttributeValues ()Ljava/util/Map;
10401023
public abstract fun getFilter ()Laws/sdk/kotlin/hll/dynamodbmapper/expressions/BooleanExpr;
10411024
public abstract fun getKeyCondition ()Laws/sdk/kotlin/hll/dynamodbmapper/expressions/KeyFilter;
10421025
public abstract fun getLimit ()Ljava/lang/Integer;
@@ -1054,8 +1037,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryRequestBuil
10541037
public final fun filter (Lkotlin/jvm/functions/Function1;)V
10551038
public final fun getConsistentRead ()Ljava/lang/Boolean;
10561039
public final fun getExclusiveStartKey ()Ljava/lang/Object;
1057-
public final fun getExpressionAttributeNames ()Ljava/util/Map;
1058-
public final fun getExpressionAttributeValues ()Ljava/util/Map;
10591040
public final fun getFilter ()Laws/sdk/kotlin/hll/dynamodbmapper/expressions/BooleanExpr;
10601041
public final fun getKeyCondition ()Laws/sdk/kotlin/hll/dynamodbmapper/expressions/KeyFilter;
10611042
public final fun getLimit ()Ljava/lang/Integer;
@@ -1064,8 +1045,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/QueryRequestBuil
10641045
public final fun getSelect ()Laws/sdk/kotlin/services/dynamodb/model/Select;
10651046
public final fun setConsistentRead (Ljava/lang/Boolean;)V
10661047
public final fun setExclusiveStartKey (Ljava/lang/Object;)V
1067-
public final fun setExpressionAttributeNames (Ljava/util/Map;)V
1068-
public final fun setExpressionAttributeValues (Ljava/util/Map;)V
10691048
public final fun setFilter (Laws/sdk/kotlin/hll/dynamodbmapper/expressions/BooleanExpr;)V
10701049
public final fun setKeyCondition (Laws/sdk/kotlin/hll/dynamodbmapper/expressions/KeyFilter;)V
10711050
public final fun setLimit (Ljava/lang/Integer;)V
@@ -1114,8 +1093,6 @@ public abstract interface class aws/sdk/kotlin/hll/dynamodbmapper/operations/Sca
11141093
public static final field Companion Laws/sdk/kotlin/hll/dynamodbmapper/operations/ScanRequest$Companion;
11151094
public abstract fun getConsistentRead ()Ljava/lang/Boolean;
11161095
public abstract fun getExclusiveStartKey ()Ljava/lang/Object;
1117-
public abstract fun getExpressionAttributeNames ()Ljava/util/Map;
1118-
public abstract fun getExpressionAttributeValues ()Ljava/util/Map;
11191096
public abstract fun getFilter ()Laws/sdk/kotlin/hll/dynamodbmapper/expressions/BooleanExpr;
11201097
public abstract fun getLimit ()Ljava/lang/Integer;
11211098
public abstract fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
@@ -1133,8 +1110,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanRequestBuild
11331110
public final fun filter (Lkotlin/jvm/functions/Function1;)V
11341111
public final fun getConsistentRead ()Ljava/lang/Boolean;
11351112
public final fun getExclusiveStartKey ()Ljava/lang/Object;
1136-
public final fun getExpressionAttributeNames ()Ljava/util/Map;
1137-
public final fun getExpressionAttributeValues ()Ljava/util/Map;
11381113
public final fun getFilter ()Laws/sdk/kotlin/hll/dynamodbmapper/expressions/BooleanExpr;
11391114
public final fun getLimit ()Ljava/lang/Integer;
11401115
public final fun getReturnConsumedCapacity ()Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;
@@ -1143,8 +1118,6 @@ public final class aws/sdk/kotlin/hll/dynamodbmapper/operations/ScanRequestBuild
11431118
public final fun getTotalSegments ()Ljava/lang/Integer;
11441119
public final fun setConsistentRead (Ljava/lang/Boolean;)V
11451120
public final fun setExclusiveStartKey (Ljava/lang/Object;)V
1146-
public final fun setExpressionAttributeNames (Ljava/util/Map;)V
1147-
public final fun setExpressionAttributeValues (Ljava/util/Map;)V
11481121
public final fun setFilter (Laws/sdk/kotlin/hll/dynamodbmapper/expressions/BooleanExpr;)V
11491122
public final fun setLimit (Ljava/lang/Integer;)V
11501123
public final fun setReturnConsumedCapacity (Laws/sdk/kotlin/services/dynamodb/model/ReturnConsumedCapacity;)V

0 commit comments

Comments
 (0)