diff --git a/services-custom/dynamodb-mapper/pom.xml b/services-custom/dynamodb-mapper/pom.xml index 7f0ae7b5a8c3..db8855622266 100644 --- a/services-custom/dynamodb-mapper/pom.xml +++ b/services-custom/dynamodb-mapper/pom.xml @@ -43,7 +43,7 @@ - software.amazon.awssdk.dynamodb.mapper + software.amazon.awssdk.mapper.dynamodb diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AbstractDynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractDynamoDBMapper.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AbstractDynamoDBMapper.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractDynamoDBMapper.java index 3930f22d5743..cd32170cdf0f 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AbstractDynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractDynamoDBMapper.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper.FailedBatch; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.FailedBatch; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AbstractEnumMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractEnumMarshaller.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AbstractEnumMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractEnumMarshaller.java index 7728bb18137c..ac7a6a24635e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AbstractEnumMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AbstractEnumMarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.util.Throwables.failure; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ArgumentMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ArgumentMarshaller.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ArgumentMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ArgumentMarshaller.java index a55ffaa1f37b..19f10a22c6a0 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ArgumentMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ArgumentMarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ArgumentUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ArgumentUnmarshaller.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ArgumentUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ArgumentUnmarshaller.java index 8423c2003977..12462c0004a7 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ArgumentUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ArgumentUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; import java.text.ParseException; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformer.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformer.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformer.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformer.java index ecb268d40218..fbe888663ce7 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformer.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformer.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformerChain.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformerChain.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformerChain.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformerChain.java index 57094ce9e378..ab63052eaa25 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformerChain.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformerChain.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.ArrayList; import java.util.Arrays; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadContext.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadContext.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadContext.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadContext.java index 5a2cd66c10e4..6dad003936ff 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadContext.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadContext.java @@ -14,7 +14,7 @@ * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.model.BatchGetItemRequest; import com.amazonaws.services.dynamodbv2.model.BatchGetItemResult; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionSchema.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConversionSchema.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionSchema.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConversionSchema.java index 0f94a9eb120e..a19d7522748b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionSchema.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConversionSchema.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.HashMap; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionSchemas.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConversionSchemas.java similarity index 88% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionSchemas.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConversionSchemas.java index ec3d657f6cff..4960573e370e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionSchemas.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConversionSchemas.java @@ -12,81 +12,81 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; - -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BinaryAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BinarySetAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BooleanAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.ListAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.MapAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.NumberAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.NumberSetAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardBeanProperties.Bean; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardModelFactories.Rule; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardModelFactories.RuleFactory; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.BooleanSetToNumberSetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.BooleanToBooleanMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.BooleanToNumberMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.ByteArraySetToBinarySetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.ByteArrayToBinaryMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.ByteBufferSetToBinarySetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.ByteBufferToBinaryMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.CalendarSetToStringSetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.CalendarToStringMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.CollectionToListMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.CustomMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.DateSetToStringSetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.DateToStringMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.MapToMapMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.NumberSetToNumberSetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.NumberToNumberMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.ObjectSetToStringSetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.ObjectToMapMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.ObjectToStringMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.S3LinkToStringMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.StringSetToStringSetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.StringToStringMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.marshallers.UUIDSetToStringSetMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.BigDecimalSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.BigDecimalUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.BigIntegerSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.BigIntegerUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.BooleanSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.BooleanUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ByteArraySetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ByteArrayUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ByteBufferSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ByteBufferUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ByteSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ByteUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.CalendarSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.CalendarUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.CustomUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.DateSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.DateUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.DoubleSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.DoubleUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.FloatSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.FloatUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.IntegerSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.IntegerUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ListUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.LongSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.LongUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.MapUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.NullableUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ObjectSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ObjectUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.S3LinkUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ShortSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.ShortUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.StringSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.StringUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.UUIDSetUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers.UUIDUnmarshaller; +package software.amazon.awssdk.mapper.dynamodb; + +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BinaryAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BinarySetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BooleanAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.ListAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.MapAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.NumberAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.NumberSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.StandardBeanProperties.Bean; +import software.amazon.awssdk.mapper.dynamodb.StandardModelFactories.Rule; +import software.amazon.awssdk.mapper.dynamodb.StandardModelFactories.RuleFactory; +import software.amazon.awssdk.mapper.dynamodb.marshallers.BooleanSetToNumberSetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.BooleanToBooleanMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.BooleanToNumberMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.ByteArraySetToBinarySetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.ByteArrayToBinaryMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.ByteBufferSetToBinarySetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.ByteBufferToBinaryMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.CalendarSetToStringSetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.CalendarToStringMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.CollectionToListMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.CustomMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.DateSetToStringSetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.DateToStringMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.MapToMapMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.NumberSetToNumberSetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.NumberToNumberMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.ObjectSetToStringSetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.ObjectToMapMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.ObjectToStringMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.S3LinkToStringMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.StringSetToStringSetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.StringToStringMarshaller; +import software.amazon.awssdk.mapper.dynamodb.marshallers.UUIDSetToStringSetMarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.BigDecimalSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.BigDecimalUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.BigIntegerSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.BigIntegerUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.BooleanSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.BooleanUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ByteArraySetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ByteArrayUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ByteBufferSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ByteBufferUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ByteSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ByteUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.CalendarSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.CalendarUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.CustomUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.DateSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.DateUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.DoubleSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.DoubleUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.FloatSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.FloatUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.IntegerSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.IntegerUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ListUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.LongSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.LongUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.MapUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.NullableUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ObjectSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ObjectUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.S3LinkUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ShortSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.ShortUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.StringSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.StringUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.UUIDSetUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.unmarshallers.UUIDUnmarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import org.apache.commons.logging.Log; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConvertibleType.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConvertibleType.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConvertibleType.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConvertibleType.java index 9ba8b74f4d36..095a9db4fad6 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ConvertibleType.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ConvertibleType.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.annotation.SdkInternalApi; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardAnnotationMaps.TypedMap; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Scalar; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Vector; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.StandardAnnotationMaps.TypedMap; +import software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Scalar; +import software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Vector; import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; import java.lang.reflect.Method; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDB.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDB.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDB.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDB.java index b56a104a55f5..182ecff4dd12 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDB.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDB.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAttribute.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAttribute.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAttribute.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAttribute.java index acdc00b97eff..614a22e63f68 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAttribute.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAttribute.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -52,7 +52,7 @@ /** * Optional parameter when using {@link DynamoDBFlattened}; identifies * the field/property name on the target class to map as the attribute. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBFlattened + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBFlattened */ String mappedBy() default ""; } diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerateStrategy.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerateStrategy.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerateStrategy.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerateStrategy.java index 1ba954328ad8..01d6ebe4ff05 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerateStrategy.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerateStrategy.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; /** * Enumeration of possible auto-generation strategies. diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerated.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerated.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerated.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerated.java index 6110858b7d89..eb217642c4e4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerated.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerated.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedDefault.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedDefault.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedDefault.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedDefault.java index 14ace806c62a..cb20405ecade 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedDefault.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedDefault.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedKey.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedKey.java similarity index 91% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedKey.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedKey.java index 05a4d806ca22..f7901a5bdde8 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedKey.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedKey.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -28,7 +28,7 @@ * and setter must be declared in the same class. This annotation can be applied * to both primary and index keys. * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBGeneratedUuid + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBGeneratedUuid * @see java.util.UUID */ @DynamoDBGeneratedUuid(DynamoDBAutoGenerateStrategy.CREATE) diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedTimestamp.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedTimestamp.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedTimestamp.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedTimestamp.java index 13c933485d9d..ede36b7dd49e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGeneratedTimestamp.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGeneratedTimestamp.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -48,7 +48,7 @@ /** * The auto-generation strategy; default is {@code ALWAYS}. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy */ DynamoDBAutoGenerateStrategy strategy() default DynamoDBAutoGenerateStrategy.ALWAYS; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerator.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerator.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerator.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerator.java index dde9b5b71cb6..8c153decd4e1 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBAutoGenerator.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBAutoGenerator.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.annotation.SdkInternalApi; @@ -36,7 +36,7 @@ * * @param The object's field/property value type. * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerated + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerated */ public interface DynamoDBAutoGenerator { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBConvertedBool.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBConvertedBool.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBConvertedBool.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBConvertedBool.java index d1ef17970bb5..e49f92a005fe 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBConvertedBool.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBConvertedBool.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDeleteExpression.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDeleteExpression.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDeleteExpression.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDeleteExpression.java index 651478334670..7a6bf67af616 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDeleteExpression.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDeleteExpression.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.HashMap; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDelimited.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDelimited.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDelimited.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDelimited.java index 23ee74e919d4..cd76958a9cf6 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDelimited.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDelimited.java @@ -12,10 +12,10 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardBeanProperties.Bean; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardBeanProperties.BeanMap; +import software.amazon.awssdk.mapper.dynamodb.StandardBeanProperties.Bean; +import software.amazon.awssdk.mapper.dynamodb.StandardBeanProperties.BeanMap; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDocument.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDocument.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDocument.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDocument.java index 2cd91a2ed5a4..3cab28143b3f 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBDocument.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBDocument.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBFlattened.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBFlattened.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBFlattened.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBFlattened.java index 23b43d910042..3f6605553bf4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBFlattened.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBFlattened.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBGeneratedUuid.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBGeneratedUuid.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBGeneratedUuid.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBGeneratedUuid.java index 0cfd5187ca23..9c8fb129ff07 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBGeneratedUuid.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBGeneratedUuid.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBHashKey.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBHashKey.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBHashKey.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBHashKey.java index b8c586c22409..7ab27e5a1db6 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBHashKey.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBHashKey.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIgnore.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIgnore.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIgnore.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIgnore.java index e82d06883c78..c24ef9361a32 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIgnore.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIgnore.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIndexHashKey.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIndexHashKey.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIndexHashKey.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIndexHashKey.java index 93931b4c048a..0435192f6e1a 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIndexHashKey.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIndexHashKey.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIndexRangeKey.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIndexRangeKey.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIndexRangeKey.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIndexRangeKey.java index 8462d2d41c36..717706110502 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBIndexRangeKey.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBIndexRangeKey.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBKeyed.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBKeyed.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBKeyed.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBKeyed.java index 05a9125358bf..6cbcfd8ad0a1 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBKeyed.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBKeyed.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.model.KeyType; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapper.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java index 916a859f99b5..d94ccc23d86f 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapper.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.AmazonServiceException; import com.amazonaws.AmazonWebServiceRequest; @@ -20,10 +20,10 @@ import com.amazonaws.auth.AWSCredentialsProvider; import com.amazonaws.retry.RetryUtils; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchLoadRetryStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchWriteRetryStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchLoadRetryStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchWriteRetryStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; import com.amazonaws.services.dynamodbv2.model.AttributeAction; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.AttributeValue; @@ -92,15 +92,15 @@ import static com.amazonaws.services.dynamodbv2.model.KeyType.HASH; import static com.amazonaws.services.dynamodbv2.model.KeyType.RANGE; -import static com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest.TransactionWriteOperation; -import static com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest.TransactionWriteOperationType; +import static software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest.TransactionWriteOperation; +import static software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest.TransactionWriteOperationType; /** * Object mapper for domain-object interaction with DynamoDB. *

* To use, define a domain class that represents an item in a DynamoDB table and * annotate it with the annotations found in the - * com.amazonaws.services.dynamodbv2.datamodeling package. In order to allow the + * software.amazon.awssdk.mapper.dynamodb package. In order to allow the * mapper to correctly persist the data, each modeled property in the domain * class should be accessible via getter and setter methods, and each property * annotation should be either applied to the getter method or the class field. diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfig.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperConfig.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfig.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperConfig.java index 42a714ee9328..adc2e3f3d5f4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfig.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperConfig.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.metrics.RequestMetricCollector; import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes; @@ -771,7 +771,7 @@ public static class NoRetryBatchLoadRetryStrategy implements BatchLoadRetryStrat public static final NoRetryBatchLoadRetryStrategy INSTANCE = new NoRetryBatchLoadRetryStrategy(); /* (non-Javadoc) - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchLoadRetryStrategy#getMaxRetryOnUnprocessedKeys(java.util.Map, java.util.Map) + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchLoadRetryStrategy#getMaxRetryOnUnprocessedKeys(java.util.Map, java.util.Map) */ @Override public boolean shouldRetry(final BatchLoadContext batchLoadContext) { @@ -779,7 +779,7 @@ public boolean shouldRetry(final BatchLoadContext batchLoadContext) { } /* (non-Javadoc) - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchLoadRetryStrategy#getDelayBeforeNextRetry(java.util.Map, int) + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchLoadRetryStrategy#getDelayBeforeNextRetry(java.util.Map, int) */ @Override public long getDelayBeforeNextRetry(final BatchLoadContext batchLoadContext) { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperFieldModel.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperFieldModel.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperFieldModel.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperFieldModel.java index 828d65f44a8c..0514b455295d 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperFieldModel.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperFieldModel.java @@ -12,10 +12,10 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy.ALWAYS; -import static com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Vector.LIST; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy.ALWAYS; +import static software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Vector.LIST; import static com.amazonaws.services.dynamodbv2.model.ComparisonOperator.BEGINS_WITH; import static com.amazonaws.services.dynamodbv2.model.ComparisonOperator.BETWEEN; import static com.amazonaws.services.dynamodbv2.model.ComparisonOperator.CONTAINS; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperModelFactory.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperModelFactory.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperModelFactory.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperModelFactory.java index 650094d42bd2..764aabd34ae3 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperModelFactory.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperModelFactory.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.annotation.SdkInternalApi; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperTableModel.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperTableModel.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperTableModel.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperTableModel.java index d91998904a1f..5eb29260cf81 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperTableModel.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperTableModel.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.services.dynamodbv2.model.KeyType.HASH; import static com.amazonaws.services.dynamodbv2.model.KeyType.RANGE; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMappingException.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMappingException.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMappingException.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMappingException.java index f06e88ecb941..aa6e52e7dffb 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMappingException.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMappingException.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; /** * Generic exception for problems occuring when mapping DynamoDB items to Java diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMappingsRegistry.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMappingsRegistry.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMappingsRegistry.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMappingsRegistry.java index 5aaba8570d1a..312537890069 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMappingsRegistry.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMappingsRegistry.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; import java.util.Collection; @@ -22,7 +22,7 @@ import java.util.concurrent.ConcurrentMap; import com.amazonaws.annotation.SdkInternalApi; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardBeanProperties.Bean; +import software.amazon.awssdk.mapper.dynamodb.StandardBeanProperties.Bean; /** * Reflection assistant for {@link DynamoDBMapper} diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMarshaller.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMarshaller.java index ea2965161c00..b5f93e6c2d48 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; /** * Marshaller interface for storing complex types in DynamoDB as Strings. diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMarshalling.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMarshalling.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMarshalling.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMarshalling.java index e67a8920a609..3dda3eaf862e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMarshalling.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMarshalling.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBNamed.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBNamed.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBNamed.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBNamed.java index 3541ffc9b4c9..8c988a5db592 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBNamed.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBNamed.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBNativeBoolean.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBNativeBoolean.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBNativeBoolean.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBNativeBoolean.java index aa95fde566ea..8385e0b00df4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBNativeBoolean.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBNativeBoolean.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBQueryExpression.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBQueryExpression.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBQueryExpression.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBQueryExpression.java index 3b4c3e672607..ca140083d72b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBQueryExpression.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBQueryExpression.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.HashMap; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBRangeKey.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBRangeKey.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBRangeKey.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBRangeKey.java index 19a3266a130f..e126783d4f42 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBRangeKey.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBRangeKey.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBReflector.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBReflector.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBReflector.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBReflector.java index e661f7e60adc..7cb0c0dd7ec6 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBReflector.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBReflector.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; import java.util.Collection; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBSaveExpression.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBSaveExpression.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBSaveExpression.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBSaveExpression.java index 22d140e389dc..581bcde7b741 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBSaveExpression.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBSaveExpression.java @@ -13,7 +13,7 @@ * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.HashMap; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBScalarAttribute.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBScalarAttribute.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBScalarAttribute.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBScalarAttribute.java index b473c38e5c4e..362f77f06f7b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBScalarAttribute.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBScalarAttribute.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBScanExpression.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBScanExpression.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBScanExpression.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBScanExpression.java index 8c89c82dd1f1..490f7e015cab 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBScanExpression.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBScanExpression.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.HashMap; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTable.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTable.java similarity index 88% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTable.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTable.java index 3ae4ea8e08b7..c132902066f0 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTable.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTable.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -20,7 +20,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameOverride; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameOverride; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTableMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java similarity index 88% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTableMapper.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java index a75b22fb0529..d04a7c3ce44d 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTableMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTableMapper.java @@ -12,11 +12,11 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDeleteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBSaveExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBDeleteExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression; import com.amazonaws.services.dynamodbv2.model.ConditionalCheckFailedException; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.DeleteTableRequest; @@ -131,7 +131,7 @@ * @param The hash key value type. * @param The range key value type; use ? if no range key. * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper * @see com.amazonaws.services.dynamodbv2.AmazonDynamoDB */ public final class DynamoDBTableMapper { @@ -194,7 +194,7 @@ public DynamoDBMapperFieldModel rangeKey() { * Retrieves multiple items from the table using their primary keys. * @param itemsToGet The items to get. * @return The list of objects. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#batchLoad + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#batchLoad */ public List batchLoad(Iterable itemsToGet) { final Map> results = mapper.batchLoad(itemsToGet); @@ -208,7 +208,7 @@ public List batchLoad(Iterable itemsToGet) { * Saves the objects given using one or more calls to the batchWriteItem API. * @param objectsToSave The objects to save. * @return The list of failed batches. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#batchSave + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#batchSave */ public List batchSave(Iterable objectsToSave) { return mapper.batchWrite(objectsToSave, (Iterable)Collections.emptyList()); @@ -218,7 +218,7 @@ public List batchSave(Iterable objectsToSave) { * Deletes the objects given using one or more calls to the batchWtiteItem API. * @param objectsToDelete The objects to delete. * @return The list of failed batches. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#batchDelete + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#batchDelete */ public List batchDelete(Iterable objectsToDelete) { return mapper.batchWrite((Iterable)Collections.emptyList(), objectsToDelete); @@ -230,7 +230,7 @@ public List batchDelete(Iterable objectsToDelete) * @param objectsToWrite The objects to write. * @param objectsToDelete The objects to delete. * @return The list of failed batches. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#batchWrite + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#batchWrite */ public List batchWrite(Iterable objectsToWrite, Iterable objectsToDelete) { return mapper.batchWrite(objectsToWrite, objectsToDelete); @@ -238,9 +238,9 @@ public List batchWrite(Iterable objectsToWrite, I /** * Transactionally writes objects specified by transactionWriteRequest by calling - * {@link com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#transactionWrite(TransactionWriteRequest)} API. + * {@link software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#transactionWrite(TransactionWriteRequest)} API. * @param transactionWriteRequest List of objects to write - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#transactionWrite(TransactionWriteRequest) + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#transactionWrite(TransactionWriteRequest) */ public void transactionWrite(TransactionWriteRequest transactionWriteRequest) { for (TransactionWriteRequest.TransactionWriteOperation transactionWriteOperation : transactionWriteRequest.getTransactionWriteOperations()) { @@ -254,10 +254,10 @@ public void transactionWrite(TransactionWriteRequest transactionWriteRequest) { /** * Transactionally loads objects specified by transactionLoadRequest by calling - * {@link com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#transactionLoad(TransactionLoadRequest)} API. + * {@link software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#transactionLoad(TransactionLoadRequest)} API. * @param transactionLoadRequest List of objects to load * @return List of objects - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#transactionLoad(TransactionLoadRequest) + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#transactionLoad(TransactionLoadRequest) */ public List transactionLoad(TransactionLoadRequest transactionLoadRequest) { for (Object object : transactionLoadRequest.getObjectsToLoad() ) { @@ -272,7 +272,7 @@ public List transactionLoad(TransactionLoadRequest transactionLoadReques * Loads an object with the hash key given. * @param hashKey The hash key value. * @return The object. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#load + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#load */ public T load(H hashKey) { return mapper.load(model.targetType(), hashKey); @@ -283,7 +283,7 @@ public T load(H hashKey) { * @param hashKey The hash key value. * @param rangeKey The range key value. * @return The object. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#load + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#load */ public T load(H hashKey, R rangeKey) { return mapper.load(model.targetType(), hashKey, rangeKey); @@ -292,7 +292,7 @@ public T load(H hashKey, R rangeKey) { /** * Saves the object given into DynamoDB. * @param object The object to save. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#save + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#save */ public void save(T object) { mapper.save(object); @@ -302,7 +302,7 @@ public void save(T object) { * Saves the object given into DynamoDB using the specified saveExpression. * @param object The object to save. * @param saveExpression The save expression. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#save + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#save */ public void save(T object, DynamoDBSaveExpression saveExpression) { mapper.save(object, saveExpression); @@ -313,8 +313,8 @@ public void save(T object, DynamoDBSaveExpression saveExpression) { * and if applicable, the range key, does not already exist. * @param object The object to create. * @throws ConditionalCheckFailedException If the object exists. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#save - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBSaveExpression + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#save + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression * @see com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue */ public void saveIfNotExists(T object) throws ConditionalCheckFailedException { @@ -331,8 +331,8 @@ public void saveIfNotExists(T object) throws ConditionalCheckFailedException { * and, if applicable, the range key, already exist. * @param object The object to update. * @throws ConditionalCheckFailedException If the object does not exist. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#save - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBSaveExpression + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#save + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression * @see com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue */ public void saveIfExists(T object) throws ConditionalCheckFailedException { @@ -347,7 +347,7 @@ public void saveIfExists(T object) throws ConditionalCheckFailedException { /** * Deletes the given object from its DynamoDB table. * @param object The object to delete. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#delete + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#delete */ public final void delete(final T object) { mapper.delete(object); @@ -358,7 +358,7 @@ public final void delete(final T object) { * deleteExpression. * @param object The object to delete. * @param deleteExpression The delete expression. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#delete + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#delete */ public final void delete(final T object, final DynamoDBDeleteExpression deleteExpression) { mapper.delete(object, deleteExpression); @@ -369,8 +369,8 @@ public final void delete(final T object, final DynamoDBDeleteExpression deleteEx * the hash and, if applicable, the range key, already exist. * @param object The object to delete. * @throws ConditionalCheckFailedException If the object does not exist. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#delete - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDeleteExpression + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#delete + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBDeleteExpression * @see com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue */ public void deleteIfExists(T object) throws ConditionalCheckFailedException { @@ -387,7 +387,7 @@ public void deleteIfExists(T object) throws ConditionalCheckFailedException { * items, without returning any of the actual item data * @param queryExpression The query expression. * @return The count. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#count + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#count */ public int count(DynamoDBQueryExpression queryExpression) { return mapper.count(model.targetType(), queryExpression); @@ -398,7 +398,7 @@ public int count(DynamoDBQueryExpression queryExpression) { * unmodifiable list of instantiated objects. * @param queryExpression The query expression. * @return The query results. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#query + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#query */ public PaginatedQueryList query(DynamoDBQueryExpression queryExpression) { return mapper.query(model.targetType(), queryExpression); @@ -409,7 +409,7 @@ public PaginatedQueryList query(DynamoDBQueryExpression queryExpression) { * results. * @param queryExpression The query expression. * @return The query results. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#query + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#query */ public QueryResultPage queryPage(DynamoDBQueryExpression queryExpression) { return mapper.queryPage(model.targetType(), queryExpression); @@ -420,7 +420,7 @@ public QueryResultPage queryPage(DynamoDBQueryExpression queryExpression) * items, without returning any of the actual item data. * @param scanExpression The scan expression. * @return The count. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#count + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#count */ public int count(DynamoDBScanExpression scanExpression) { return mapper.count(model.targetType(), scanExpression); @@ -431,7 +431,7 @@ public int count(DynamoDBScanExpression scanExpression) { * as an unmodifiable list of instantiated objects. * @param scanExpression The scan expression. * @return The scan results. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#scan + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#scan */ public PaginatedScanList scan(DynamoDBScanExpression scanExpression) { return mapper.scan(model.targetType(), scanExpression); @@ -442,7 +442,7 @@ public PaginatedScanList scan(DynamoDBScanExpression scanExpression) { * matching results. * @param scanExpression The scan expression. * @return The scan results. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#scanPage + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#scanPage */ public ScanResultPage scanPage(DynamoDBScanExpression scanExpression) { return mapper.scanPage(model.targetType(), scanExpression); @@ -455,7 +455,7 @@ public ScanResultPage scanPage(DynamoDBScanExpression scanExpression) { * @param scanExpression The scan expression. * @param totalSegments The total segments. * @return The scan results. - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper#parallelScan + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper#parallelScan */ public PaginatedParallelScanList parallelScan(DynamoDBScanExpression scanExpression, int totalSegments) { return mapper.parallelScan(model.targetType(), scanExpression, totalSegments); diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTransactionLoadExpression.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTransactionLoadExpression.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTransactionLoadExpression.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTransactionLoadExpression.java index f5ce5c462fdb..b57035344b42 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTransactionLoadExpression.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTransactionLoadExpression.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTransactionWriteExpression.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTransactionWriteExpression.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTransactionWriteExpression.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTransactionWriteExpression.java index f61f38fc02dc..bd4229ae7370 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTransactionWriteExpression.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTransactionWriteExpression.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverted.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverted.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverted.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverted.java index a10952785503..523debfce899 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverted.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverted.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedEnum.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedEnum.java similarity index 92% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedEnum.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedEnum.java index 398698a3467e..11a22638aac1 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedEnum.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedEnum.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -37,7 +37,7 @@ * ensure that all systems have the correct code to map it from the item * record in DynamoDB to your objects.

* - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverted */ @DynamoDBTyped(DynamoDBMapperFieldModel.DynamoDBAttributeType.S) @Retention(RetentionPolicy.RUNTIME) diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedEpochDate.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedEpochDate.java similarity index 91% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedEpochDate.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedEpochDate.java index 8853191f576c..fcdfaeba33e3 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedEpochDate.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedEpochDate.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -29,7 +29,7 @@ * public Date getDate() * * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverted */ @DynamoDB @DynamoDBTyped(DynamoDBMapperFieldModel.DynamoDBAttributeType.N) diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedJson.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedJson.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedJson.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedJson.java index c395f39969f8..82ec02996585 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedJson.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedJson.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -53,7 +53,7 @@ *
  • Currency(79.99,"USD") = "{\"amount\":79.99,\"unit\":\"USD\"}"
    • * * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverted */ @DynamoDBTypeConverted(converter=DynamoDBTypeConvertedJson.Converter.class) @DynamoDBTyped(DynamoDBMapperFieldModel.DynamoDBAttributeType.S) diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedTimestamp.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedTimestamp.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedTimestamp.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedTimestamp.java index 1d279a28b100..032f590544ab 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConvertedTimestamp.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConvertedTimestamp.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -44,8 +44,8 @@ * *

    Compatible with {@link DynamoDBAutoGeneratedTimestamp}

    * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverted * @see java.text.SimpleDateFormat * @see java.util.TimeZone */ diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverter.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverter.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverter.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverter.java index d4bb9d19dd72..e26d7ca15137 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverter.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverter.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.annotation.SdkInternalApi; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverterFactory.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverterFactory.java similarity index 96% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverterFactory.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverterFactory.java index a0a1add821db..fb7e931d925b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTypeConverterFactory.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTypeConverterFactory.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Vector; +import software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Vector; import java.util.AbstractMap.SimpleImmutableEntry; import java.util.LinkedHashMap; @@ -38,7 +38,7 @@ * public MyObject getMyObject() * * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig */ public abstract class DynamoDBTypeConverterFactory { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTyped.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTyped.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTyped.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTyped.java index 5e24154a52f0..56fe0f154fe5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBTyped.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBTyped.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; @@ -147,8 +147,8 @@ * *

    May be used as a meta-annotation.

    * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverterFactory + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverted + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverterFactory */ @DynamoDB @Inherited diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBVersionAttribute.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersionAttribute.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBVersionAttribute.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersionAttribute.java index 15659f3a692e..1deb20b85bc5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBVersionAttribute.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersionAttribute.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -38,7 +38,7 @@ * {@link com.amazonaws.services.dynamodbv2.AmazonDynamoDB#batchWriteItem(BatchWriteItemRequest)} * API.

    * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersioned + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBVersioned */ @DynamoDB @DynamoDBVersioned diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBVersioned.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersioned.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBVersioned.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersioned.java index 656b1216892a..4cf51f17e8ea 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBVersioned.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBVersioned.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Scalar; +import software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Scalar; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -48,7 +48,7 @@ * *

    May be used as a meta-annotation.

    * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute */ @DynamoDB @DynamoDBAutoGenerated(generator=DynamoDBVersioned.Generator.class) diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/IDynamoDBMapper.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/IDynamoDBMapper.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java index aea23b91de1a..347ea9e8f207 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/IDynamoDBMapper.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/IDynamoDBMapper.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper.FailedBatch; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.PaginationLoadingStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.FailedBatch; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.BatchGetItemRequest; import com.amazonaws.services.dynamodbv2.model.BatchWriteItemRequest; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ItemConverter.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ItemConverter.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ItemConverter.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ItemConverter.java index ddd10d0d5ce6..00343ec9ca24 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ItemConverter.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ItemConverter.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/JsonMarshaller.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/JsonMarshaller.java index 88114eac42f4..3fa24329eca4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/JsonMarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.util.Throwables.failure; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/KeyPair.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/KeyPair.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/KeyPair.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/KeyPair.java index 9bb510819f7f..77a78cb02ccb 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/KeyPair.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/KeyPair.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; public class KeyPair { private Object hashKey; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedList.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedList.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedList.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedList.java index 33894e72240f..87d8edbb37ac 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedList.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedList.java @@ -12,10 +12,10 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.PaginationLoadingStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; import java.util.ArrayList; import java.util.Collection; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedParallelScanList.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedParallelScanList.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedParallelScanList.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedParallelScanList.java index 5199a9fb5cf9..648703a9103e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedParallelScanList.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedParallelScanList.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.LinkedList; import java.util.List; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.PaginationLoadingStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; import com.amazonaws.services.dynamodbv2.model.ScanResult; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedQueryList.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedQueryList.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedQueryList.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedQueryList.java index c8b2715fabb2..137c37f857ac 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedQueryList.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedQueryList.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.List; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.PaginationLoadingStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; import com.amazonaws.services.dynamodbv2.model.QueryRequest; import com.amazonaws.services.dynamodbv2.model.QueryResult; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedScanList.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedScanList.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedScanList.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedScanList.java index 396840e7791d..f3462caab511 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedScanList.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/PaginatedScanList.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.List; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.PaginationLoadingStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; import com.amazonaws.services.dynamodbv2.model.ScanRequest; import com.amazonaws.services.dynamodbv2.model.ScanResult; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ParallelScanTask.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ParallelScanTask.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ParallelScanTask.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ParallelScanTask.java index 12999b578938..6eadf187c53c 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ParallelScanTask.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ParallelScanTask.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.SdkClientException; import com.amazonaws.AmazonClientException; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/QueryResultPage.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/QueryResultPage.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/QueryResultPage.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/QueryResultPage.java index c211dc7ac4e4..1985363c29a9 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/QueryResultPage.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/QueryResultPage.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.List; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ReflectionUtils.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ReflectionUtils.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ReflectionUtils.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ReflectionUtils.java index fc5aeeed9f75..28a95331c218 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ReflectionUtils.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ReflectionUtils.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.annotation.Annotation; import java.lang.reflect.Field; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/S3ClientCache.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/S3ClientCache.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/S3ClientCache.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/S3ClientCache.java index 015d2ecce312..4f7029f8edc5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/S3ClientCache.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/S3ClientCache.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/S3Link.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/S3Link.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/S3Link.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/S3Link.java index 11f50e391bf9..2882603f9d7f 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/S3Link.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/S3Link.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.io.ByteArrayInputStream; import java.io.File; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ScanResultPage.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ScanResultPage.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ScanResultPage.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ScanResultPage.java index a138ebe99d55..9a2f83c4ad76 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/ScanResultPage.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/ScanResultPage.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.List; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardAnnotationMaps.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardAnnotationMaps.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardAnnotationMaps.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardAnnotationMaps.java index 9d6f6ce32fe7..83c09a238e54 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardAnnotationMaps.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardAnnotationMaps.java @@ -12,14 +12,14 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy.CREATE; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy.CREATE; import static com.amazonaws.services.dynamodbv2.model.KeyType.HASH; import static com.amazonaws.services.dynamodbv2.model.KeyType.RANGE; import com.amazonaws.annotation.SdkInternalApi; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; import com.amazonaws.services.dynamodbv2.model.KeyType; import com.amazonaws.util.StringUtils; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardBeanProperties.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardBeanProperties.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardBeanProperties.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardBeanProperties.java index 9277e9b658c0..736564e039a1 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardBeanProperties.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardBeanProperties.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.annotation.SdkInternalApi; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.Reflect; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardAnnotationMaps.FieldMap; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardAnnotationMaps.TableMap; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.Reflect; +import software.amazon.awssdk.mapper.dynamodb.StandardAnnotationMaps.FieldMap; +import software.amazon.awssdk.mapper.dynamodb.StandardAnnotationMaps.TableMap; import com.amazonaws.util.StringUtils; import java.lang.reflect.Method; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactories.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactories.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactories.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactories.java index 350880988998..45c3b49cd148 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactories.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactories.java @@ -12,16 +12,16 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.annotation.SdkInternalApi; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.Reflect; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperModelFactory.TableFactory; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter.AbstractConverter; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter.DelegateConverter; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardBeanProperties.Bean; -import com.amazonaws.services.dynamodbv2.datamodeling.StandardBeanProperties.Beans; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.Reflect; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperModelFactory.TableFactory; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverter.AbstractConverter; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverter.DelegateConverter; +import software.amazon.awssdk.mapper.dynamodb.StandardBeanProperties.Bean; +import software.amazon.awssdk.mapper.dynamodb.StandardBeanProperties.Beans; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import org.apache.commons.logging.Log; @@ -39,12 +39,12 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import static com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Scalar.BOOLEAN; -import static com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Scalar.DEFAULT; -import static com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Scalar.STRING; -import static com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Vector.LIST; -import static com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Vector.MAP; -import static com.amazonaws.services.dynamodbv2.datamodeling.StandardTypeConverters.Vector.SET; +import static software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Scalar.BOOLEAN; +import static software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Scalar.DEFAULT; +import static software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Scalar.STRING; +import static software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Vector.LIST; +import static software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Vector.MAP; +import static software.amazon.awssdk.mapper.dynamodb.StandardTypeConverters.Vector.SET; import static com.amazonaws.services.dynamodbv2.model.ScalarAttributeType.B; import static com.amazonaws.services.dynamodbv2.model.ScalarAttributeType.N; import static com.amazonaws.services.dynamodbv2.model.ScalarAttributeType.S; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardTypeConverters.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardTypeConverters.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardTypeConverters.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardTypeConverters.java index 94dd972412f5..a23c94a0b287 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardTypeConverters.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/StandardTypeConverters.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.annotation.SdkInternalApi; import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; @@ -44,7 +44,7 @@ /** * Type conversions. * - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverter */ @SdkInternalApi final class StandardTypeConverters extends DynamoDBTypeConverterFactory { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadRequest.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadRequest.java similarity index 97% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadRequest.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadRequest.java index 0b0350830c74..56d6bf37f0fc 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadRequest.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadRequest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.ArrayList; import java.util.List; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteRequest.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteRequest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteRequest.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteRequest.java index 1e62b4205a80..4ec8ec1b0d99 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteRequest.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteRequest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.ArrayList; import java.util.List; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/UpdateExpressionGenerator.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/UpdateExpressionGenerator.java similarity index 99% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/UpdateExpressionGenerator.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/UpdateExpressionGenerator.java index 1f24dabc5ca5..8bac03484ec5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/UpdateExpressionGenerator.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/UpdateExpressionGenerator.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.io.ByteArrayOutputStream; import java.io.DataOutputStream; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/VersionAttributeConditionExpressionGenerator.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/VersionAttributeConditionExpressionGenerator.java similarity index 98% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/VersionAttributeConditionExpressionGenerator.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/VersionAttributeConditionExpressionGenerator.java index af6b1485781e..479af39d8e6c 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/VersionAttributeConditionExpressionGenerator.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/VersionAttributeConditionExpressionGenerator.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.HashMap; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanSetToNumberSetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanSetToNumberSetMarshaller.java similarity index 91% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanSetToNumberSetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanSetToNumberSetMarshaller.java index e65c9f0d815a..eef1d493e1e6 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanSetToNumberSetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanSetToNumberSetMarshaller.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.NumberSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.NumberSetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanToBooleanMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanToBooleanMarshaller.java similarity index 87% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanToBooleanMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanToBooleanMarshaller.java index b1f339131da2..9904910acfa4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanToBooleanMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanToBooleanMarshaller.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BooleanAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BooleanAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanToNumberMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanToNumberMarshaller.java similarity index 89% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanToNumberMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanToNumberMarshaller.java index e1a5de9f4059..b4da217fc24d 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/BooleanToNumberMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/BooleanToNumberMarshaller.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.NumberAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.NumberAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteArraySetToBinarySetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteArraySetToBinarySetMarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteArraySetToBinarySetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteArraySetToBinarySetMarshaller.java index bf9efe372e84..3351a864955b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteArraySetToBinarySetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteArraySetToBinarySetMarshaller.java @@ -12,14 +12,14 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BinarySetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BinarySetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteArrayToBinaryMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteArrayToBinaryMarshaller.java similarity index 87% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteArrayToBinaryMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteArrayToBinaryMarshaller.java index 6e7e8c20286e..cb9fdc928bbd 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteArrayToBinaryMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteArrayToBinaryMarshaller.java @@ -12,11 +12,11 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.nio.ByteBuffer; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BinaryAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BinaryAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteBufferSetToBinarySetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteBufferSetToBinarySetMarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteBufferSetToBinarySetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteBufferSetToBinarySetMarshaller.java index 83bd0db0fa8b..edc14f33ba66 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteBufferSetToBinarySetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteBufferSetToBinarySetMarshaller.java @@ -12,14 +12,14 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BinarySetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BinarySetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteBufferToBinaryMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteBufferToBinaryMarshaller.java similarity index 87% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteBufferToBinaryMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteBufferToBinaryMarshaller.java index 1d4aadaadeda..1f6078299008 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ByteBufferToBinaryMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ByteBufferToBinaryMarshaller.java @@ -12,11 +12,11 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.nio.ByteBuffer; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.BinaryAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.BinaryAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CalendarSetToStringSetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CalendarSetToStringSetMarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CalendarSetToStringSetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CalendarSetToStringSetMarshaller.java index 6283ededae3b..df3f39d352ec 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CalendarSetToStringSetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CalendarSetToStringSetMarshaller.java @@ -12,14 +12,14 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.Calendar; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringSetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.util.DateUtils; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CalendarToStringMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CalendarToStringMarshaller.java similarity index 88% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CalendarToStringMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CalendarToStringMarshaller.java index d195e2be7f52..495cb0e71902 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CalendarToStringMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CalendarToStringMarshaller.java @@ -12,11 +12,11 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.Calendar; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.util.DateUtils; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CollectionToListMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CollectionToListMarshaller.java similarity index 89% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CollectionToListMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CollectionToListMarshaller.java index e9e59c7b78a2..7b72b374c9ad 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CollectionToListMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CollectionToListMarshaller.java @@ -12,14 +12,14 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.ListAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.ListAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class CollectionToListMarshaller implements ListAttributeMarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CustomMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CustomMarshaller.java similarity index 87% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CustomMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CustomMarshaller.java index 20dbbccea8df..fe208e0ad529 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/CustomMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/CustomMarshaller.java @@ -12,11 +12,11 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/DateSetToStringSetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/DateSetToStringSetMarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/DateSetToStringSetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/DateSetToStringSetMarshaller.java index c7b46c0ed5a4..ccd127e91c4d 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/DateSetToStringSetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/DateSetToStringSetMarshaller.java @@ -12,14 +12,14 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringSetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.util.DateUtils; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/DateToStringMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/DateToStringMarshaller.java similarity index 88% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/DateToStringMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/DateToStringMarshaller.java index 291cb8921454..93e1cd3cbb1a 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/DateToStringMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/DateToStringMarshaller.java @@ -12,11 +12,11 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.Date; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.util.DateUtils; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/MapToMapMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/MapToMapMarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/MapToMapMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/MapToMapMarshaller.java index bceba3d13c5d..a5fcfa8264e5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/MapToMapMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/MapToMapMarshaller.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.HashMap; import java.util.Map; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.MapAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.MapAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class MapToMapMarshaller implements MapAttributeMarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/NumberSetToNumberSetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/NumberSetToNumberSetMarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/NumberSetToNumberSetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/NumberSetToNumberSetMarshaller.java index 102daac1d383..527f4acbd4d5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/NumberSetToNumberSetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/NumberSetToNumberSetMarshaller.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.NumberSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.NumberSetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/NumberToNumberMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/NumberToNumberMarshaller.java similarity index 87% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/NumberToNumberMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/NumberToNumberMarshaller.java index 2ffb1f1f137b..4d376b1be550 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/NumberToNumberMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/NumberToNumberMarshaller.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.NumberAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.NumberAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectSetToStringSetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectSetToStringSetMarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectSetToStringSetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectSetToStringSetMarshaller.java index e84bda7dcc84..41f36f33ca7d 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectSetToStringSetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectSetToStringSetMarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.List; @@ -21,7 +21,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringSetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectToMapMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectToMapMarshaller.java similarity index 85% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectToMapMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectToMapMarshaller.java index cb6d6200c0e7..279fecfac192 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectToMapMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectToMapMarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.Map; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.MapAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.ItemConverter; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.MapAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ItemConverter; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class ObjectToMapMarshaller implements MapAttributeMarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectToStringMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectToStringMarshaller.java similarity index 87% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectToStringMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectToStringMarshaller.java index 7c6ea61ee987..4b8f40948fe0 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/ObjectToStringMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/ObjectToStringMarshaller.java @@ -12,9 +12,9 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/S3LinkToStringMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/S3LinkToStringMarshaller.java similarity index 86% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/S3LinkToStringMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/S3LinkToStringMarshaller.java index 5989484453eb..af4fd95d673b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/S3LinkToStringMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/S3LinkToStringMarshaller.java @@ -12,10 +12,10 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringAttributeMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.S3Link; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.S3Link; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/StringSetToStringSetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/StringSetToStringSetMarshaller.java similarity index 89% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/StringSetToStringSetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/StringSetToStringSetMarshaller.java index 64064b7a3482..6f9f9c607349 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/StringSetToStringSetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/StringSetToStringSetMarshaller.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringSetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/StringToStringMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/StringToStringMarshaller.java similarity index 88% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/StringToStringMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/StringToStringMarshaller.java index a0da27ade5a2..66e3d3f76eac 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/StringToStringMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/StringToStringMarshaller.java @@ -12,9 +12,9 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/UUIDSetToStringSetMarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/UUIDSetToStringSetMarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/UUIDSetToStringSetMarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/UUIDSetToStringSetMarshaller.java index ec40c19284b5..a94d0ac4a7f4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/UUIDSetToStringSetMarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/UUIDSetToStringSetMarshaller.java @@ -12,14 +12,14 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.UUID; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentMarshaller.StringSetAttributeMarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentMarshaller.StringSetAttributeMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/package-info.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/package-info.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/package-info.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/package-info.java index e8d31771bab7..5ef2e9e6849a 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/marshallers/package-info.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/marshallers/package-info.java @@ -16,4 +16,4 @@ /** * Standard implementations of {@code ArgumentMarshaller}. */ -package com.amazonaws.services.dynamodbv2.datamodeling.marshallers; +package software.amazon.awssdk.mapper.dynamodb.marshallers; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BSUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BSUnmarshaller.java similarity index 80% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BSUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BSUnmarshaller.java index 30dd4c8d199d..93300374a5ac 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BSUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BSUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class BSUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BUnmarshaller.java similarity index 80% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BUnmarshaller.java index 1efaa814ccdb..2f6a72a76a47 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class BUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigDecimalSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigDecimalSetUnmarshaller.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigDecimalSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigDecimalSetUnmarshaller.java index 0f7c72c62f5d..de1f37c5f5fc 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigDecimalSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigDecimalSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.math.BigDecimal; import java.util.HashSet; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigDecimalUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigDecimalUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigDecimalUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigDecimalUnmarshaller.java index 166198e930d2..58298682189e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigDecimalUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigDecimalUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.math.BigDecimal; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigIntegerSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigIntegerSetUnmarshaller.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigIntegerSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigIntegerSetUnmarshaller.java index 28346093b300..8d6cf2c507e5 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigIntegerSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigIntegerSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.math.BigInteger; import java.util.HashSet; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigIntegerUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigIntegerUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigIntegerUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigIntegerUnmarshaller.java index 5288cafb0743..935b68a3e1d2 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BigIntegerUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BigIntegerUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.math.BigInteger; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BooleanSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BooleanSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java index e50277494b42..3f96f98a2fd2 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BooleanSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanSetUnmarshaller.java @@ -12,15 +12,15 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; import java.util.HashSet; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BooleanUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanUnmarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BooleanUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanUnmarshaller.java index 732c376dcd3e..ce0245dd24f8 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/BooleanUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/BooleanUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteArraySetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteArraySetUnmarshaller.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteArraySetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteArraySetUnmarshaller.java index 2a51642de9cb..3bfbc0443e48 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteArraySetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteArraySetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteArrayUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteArrayUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteArrayUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteArrayUnmarshaller.java index 621e88a7297a..75e53b79fe29 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteArrayUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteArrayUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.nio.ByteBuffer; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteBufferSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteBufferSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteBufferSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteBufferSetUnmarshaller.java index 768b4600535d..2187cdaeed98 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteBufferSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteBufferSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.nio.ByteBuffer; import java.util.HashSet; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteBufferUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteBufferUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteBufferUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteBufferUnmarshaller.java index b4d79aa5dbe2..2904da8910a1 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteBufferUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteBufferUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteSetUnmarshaller.java index 8ac36a8d26d0..a223bbc684b4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; import java.util.Set; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteUnmarshaller.java index 0d8fc6e94911..1b5d8d18f479 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ByteUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ByteUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CalendarSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CalendarSetUnmarshaller.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CalendarSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CalendarSetUnmarshaller.java index 3fb870aba4ac..dba2c775596e 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CalendarSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CalendarSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CalendarUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CalendarUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CalendarUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CalendarUnmarshaller.java index ba00fd59a207..6b61a673c650 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CalendarUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CalendarUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.Calendar; import java.util.GregorianCalendar; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CustomUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CustomUnmarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CustomUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CustomUnmarshaller.java index 7d29c8bec569..54f081162f37 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/CustomUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/CustomUnmarshaller.java @@ -12,10 +12,10 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DateSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DateSetUnmarshaller.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DateSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DateSetUnmarshaller.java index 68437cae8ce3..95ee52e3e4b1 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DateSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DateSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.Date; import java.util.HashSet; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DateUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DateUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DateUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DateUnmarshaller.java index 60bddfa3fed2..84fbfda0114f 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DateUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DateUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.util.DateUtils; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DoubleSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DoubleSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DoubleSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DoubleSetUnmarshaller.java index c67ddffa0ecb..2d94947dce10 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DoubleSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DoubleSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; import java.util.Set; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DoubleUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DoubleUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DoubleUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DoubleUnmarshaller.java index e5a45151e71a..6e7070dcc82d 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/DoubleUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/DoubleUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/FloatSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/FloatSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/FloatSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/FloatSetUnmarshaller.java index 0faebaf793bd..a484df7fe531 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/FloatSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/FloatSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; import java.util.Set; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/FloatUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/FloatUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/FloatUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/FloatUnmarshaller.java index d3439990118d..da41ffb85c05 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/FloatUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/FloatUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/IntegerSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/IntegerSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/IntegerSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/IntegerSetUnmarshaller.java index a7cfe6058e2c..cd0c1bb29c50 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/IntegerSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/IntegerSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; import java.util.Set; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/IntegerUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/IntegerUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/IntegerUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/IntegerUnmarshaller.java index cf18a8f0ce5d..e1ec66c4756f 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/IntegerUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/IntegerUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LUnmarshaller.java similarity index 80% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LUnmarshaller.java index a74bc4dd083f..2ac05cd37ea8 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class LUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ListUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ListUnmarshaller.java similarity index 92% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ListUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ListUnmarshaller.java index 43752c153a8e..f997a166ccaa 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ListUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ListUnmarshaller.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.text.ParseException; import java.util.ArrayList; import java.util.List; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; /** diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LongSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LongSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LongSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LongSetUnmarshaller.java index 33103b2397ad..ec22516e2c08 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LongSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LongSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; import java.util.Set; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LongUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LongUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LongUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LongUnmarshaller.java index 98ab0f92a68f..683750b55db4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/LongUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/LongUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/MUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/MUnmarshaller.java similarity index 80% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/MUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/MUnmarshaller.java index ce4c876e8f0c..1aeaa03e9430 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/MUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/MUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class MUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/MapUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/MapUnmarshaller.java similarity index 92% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/MapUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/MapUnmarshaller.java index 9a406e3bb68e..83bf8ed6de3c 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/MapUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/MapUnmarshaller.java @@ -12,13 +12,13 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.text.ParseException; import java.util.HashMap; import java.util.Map; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class MapUnmarshaller extends MUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NSUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NSUnmarshaller.java similarity index 78% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NSUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NSUnmarshaller.java index 54ce391dad8f..272e1f70878b 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NSUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NSUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class NSUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NUnmarshaller.java similarity index 78% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NUnmarshaller.java index 2d6a3f65384a..8914e893fe84 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class NUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NullableUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NullableUnmarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NullableUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NullableUnmarshaller.java index fea2245f40fb..92e2fc547c86 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/NullableUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/NullableUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; import java.text.ParseException; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class NullableUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ObjectSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ObjectSetUnmarshaller.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ObjectSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ObjectSetUnmarshaller.java index 3e2884332267..8797e2648fb2 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ObjectSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ObjectSetUnmarshaller.java @@ -12,15 +12,15 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.text.ParseException; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class ObjectSetUnmarshaller extends LUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ObjectUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ObjectUnmarshaller.java similarity index 91% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ObjectUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ObjectUnmarshaller.java index a7bcc8b4cec0..b79fe0d903d4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ObjectUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ObjectUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.text.ParseException; import java.util.Map; -import com.amazonaws.services.dynamodbv2.datamodeling.ItemConverter; +import software.amazon.awssdk.mapper.dynamodb.ItemConverter; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class ObjectUnmarshaller extends MUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/S3LinkUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/S3LinkUnmarshaller.java similarity index 87% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/S3LinkUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/S3LinkUnmarshaller.java index f6fc38c8d640..374686bc0b4f 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/S3LinkUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/S3LinkUnmarshaller.java @@ -12,10 +12,10 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; -import com.amazonaws.services.dynamodbv2.datamodeling.S3ClientCache; -import com.amazonaws.services.dynamodbv2.datamodeling.S3Link; +import software.amazon.awssdk.mapper.dynamodb.S3ClientCache; +import software.amazon.awssdk.mapper.dynamodb.S3Link; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class S3LinkUnmarshaller extends SUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/SSUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/SSUnmarshaller.java similarity index 78% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/SSUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/SSUnmarshaller.java index 2bc8f169fdb3..36a588f2faee 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/SSUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/SSUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class SSUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/SUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/SUnmarshaller.java similarity index 78% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/SUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/SUnmarshaller.java index 426d7999f03b..1126299fd855 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/SUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/SUnmarshaller.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.lang.reflect.Method; -import com.amazonaws.services.dynamodbv2.datamodeling.ArgumentUnmarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.ArgumentUnmarshaller; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; import com.amazonaws.services.dynamodbv2.model.AttributeValue; abstract class SUnmarshaller implements ArgumentUnmarshaller { diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ShortSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ShortSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ShortSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ShortSetUnmarshaller.java index a21560e14f9b..d426c18710a4 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ShortSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ShortSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; import java.util.Set; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ShortUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ShortUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ShortUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ShortUnmarshaller.java index c144431b4220..018e9b38309a 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/ShortUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/ShortUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/StringSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/StringSetUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/StringSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/StringSetUnmarshaller.java index 6ebb05af9ae1..11ff493288a9 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/StringSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/StringSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/StringUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/StringUnmarshaller.java similarity index 93% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/StringUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/StringUnmarshaller.java index 2ac5feda204b..08c93451c2f3 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/StringUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/StringUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/UUIDSetUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/UUIDSetUnmarshaller.java similarity index 95% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/UUIDSetUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/UUIDSetUnmarshaller.java index e2dc041e2ff3..598c8d6fa8f6 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/UUIDSetUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/UUIDSetUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.HashSet; import java.util.Set; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/UUIDUnmarshaller.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/UUIDUnmarshaller.java similarity index 94% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/UUIDUnmarshaller.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/UUIDUnmarshaller.java index 563d1dc4b2d3..cd0afdb4fb35 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/UUIDUnmarshaller.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/UUIDUnmarshaller.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; import java.util.UUID; diff --git a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/package-info.java b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/package-info.java similarity index 90% rename from services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/package-info.java rename to services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/package-info.java index 696d3e5de77e..01d0ff2077af 100644 --- a/services-custom/dynamodb-mapper/src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers/package-info.java +++ b/services-custom/dynamodb-mapper/src/main/java/software/amazon/awssdk/mapper/dynamodb/unmarshallers/package-info.java @@ -16,4 +16,4 @@ /** * Standard implementations of {@code ArgumentUnmarshaller}. */ -package com.amazonaws.services.dynamodbv2.datamodeling.unmarshallers; +package software.amazon.awssdk.mapper.dynamodb.unmarshallers; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/GsiAlwaysUpdateTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/GsiAlwaysUpdateTest.java index 6d1e98b09bc0..ff169ecfddbc 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/GsiAlwaysUpdateTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/GsiAlwaysUpdateTest.java @@ -16,9 +16,9 @@ import static org.junit.Assert.assertNotEquals; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTableMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTableMapper; import com.amazonaws.services.dynamodbv2.model.DescribeTableRequest; import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; import com.amazonaws.services.dynamodbv2.pojos.GsiWithAlwaysUpdateTimestamp; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/TestObjectCreator.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/TestObjectCreator.java index 734622473a39..69a9c8b109e4 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/TestObjectCreator.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/TestObjectCreator.java @@ -17,12 +17,12 @@ import static com.amazonaws.services.dynamodbv2.pojos.CustomBooleanClass.CustomBoolean; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTransactionLoadExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTransactionWriteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionLoadRequest; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest.TransactionWriteOperation; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTransactionLoadExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTransactionWriteExpression; +import software.amazon.awssdk.mapper.dynamodb.TransactionLoadRequest; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest.TransactionWriteOperation; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AbstractKeyAndValIntegrationTestCase.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AbstractKeyAndValIntegrationTestCase.java index e83ed22f30cf..f6fa08fc8e4b 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AbstractKeyAndValIntegrationTestCase.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AbstractKeyAndValIntegrationTestCase.java @@ -14,15 +14,15 @@ */ package com.amazonaws.services.dynamodbv2.mapper; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; import com.amazonaws.services.dynamodbv2.pojos.KeyAndVal; import java.util.ArrayList; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedKeysIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedKeysIntegrationTest.java index 298b5456e67f..3ee98988a36c 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedKeysIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedKeysIntegrationTest.java @@ -29,15 +29,15 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBSaveExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ConditionalCheckFailedException; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedTimestampIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedTimestampIntegrationTest.java index d8cfe5fe9f5f..462a15d35e90 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedTimestampIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/AutoGeneratedTimestampIntegrationTest.java @@ -17,11 +17,11 @@ import static org.junit.Assert.assertEquals; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.pojos.KeyAndVal; import java.util.Calendar; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BatchWriteTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BatchWriteTest.java index e7b655222660..705d848d58f7 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BatchWriteTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BatchWriteTest.java @@ -20,8 +20,8 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.LocalDynamoDBTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper.FailedBatch; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.FailedBatch; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.pojos.BinaryAttributeByteBufferClass; import com.amazonaws.services.dynamodbv2.pojos.RangeKeyClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BinaryAttributesIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BinaryAttributesIntegrationTest.java index 4651f593cb46..1030d1ebd35f 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BinaryAttributesIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/BinaryAttributesIntegrationTest.java @@ -34,7 +34,7 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.PutItemRequest; import com.amazonaws.services.dynamodbv2.pojos.BinaryAttributeByteArrayClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ComplexTypeIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ComplexTypeIntegrationTest.java index 39f81509e492..1409cac0bdfe 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ComplexTypeIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ComplexTypeIntegrationTest.java @@ -34,12 +34,12 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedJson; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverted; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedJson; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverter; /** * Tests of the configuration object diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ConfigurationIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ConfigurationIntegrationTest.java index ca3decc5119b..fd168ca40795 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ConfigurationIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ConfigurationIntegrationTest.java @@ -26,15 +26,15 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameOverride; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ObjectTableNameResolver; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameOverride; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameResolver; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ObjectTableNameResolver; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Tests of the configuration object diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/CrossSDKIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/CrossSDKIntegrationTest.java index 6fd7dc56dfab..90610fe70b64 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/CrossSDKIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/CrossSDKIntegrationTest.java @@ -30,7 +30,7 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DelimitedIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DelimitedIntegrationTest.java index f574bdec6c53..9bb782c36a7f 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DelimitedIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DelimitedIntegrationTest.java @@ -18,13 +18,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDelimited; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBDelimited; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedTimestamp; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; import com.amazonaws.services.dynamodbv2.pojos.Currency; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DynamoDBTypeConvertedEpochDateTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DynamoDBTypeConvertedEpochDateTest.java index 2f11a3337593..41350472d758 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DynamoDBTypeConvertedEpochDateTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/DynamoDBTypeConvertedEpochDateTest.java @@ -15,10 +15,10 @@ package com.amazonaws.services.dynamodbv2.mapper; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedEpochDate; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedEpochDate; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; import com.amazonaws.services.dynamodbv2.model.GetItemResult; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteArrayAttributesTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteArrayAttributesTest.java index 43ddb7d790dd..30d24b4a75f8 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteArrayAttributesTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteArrayAttributesTest.java @@ -24,8 +24,8 @@ import java.util.Map; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteBufferAttributesTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteBufferAttributesTest.java index bd750e744de2..b09881712771 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteBufferAttributesTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinaryByteBufferAttributesTest.java @@ -24,8 +24,8 @@ import java.util.Map; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteArrayAttributesTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteArrayAttributesTest.java index 2675a1dc40bf..04238164c785 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteArrayAttributesTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteArrayAttributesTest.java @@ -26,8 +26,8 @@ import java.util.Set; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteBufferAttributesTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteBufferAttributesTest.java index 86cb67546721..c8eae6adac3e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteBufferAttributesTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/EmptyBinarySetByteBufferAttributesTest.java @@ -26,8 +26,8 @@ import java.util.Set; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ExceptionHandlingIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ExceptionHandlingIntegrationTest.java index 70a7c5142f41..a91322e87e7e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ExceptionHandlingIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ExceptionHandlingIntegrationTest.java @@ -22,15 +22,15 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.ConversionSchemas; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.ConversionSchemas; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.PutItemRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/FlattenedIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/FlattenedIntegrationTest.java index 3deffd869441..9938e43ecb2a 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/FlattenedIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/FlattenedIntegrationTest.java @@ -19,12 +19,12 @@ import static org.junit.Assert.assertNull; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBFlattened; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBFlattened; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.pojos.AuditRecord; import com.amazonaws.services.dynamodbv2.pojos.Currency; import com.amazonaws.services.dynamodbv2.pojos.DateRange; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequest2Test.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequest2Test.java index aade65aaa185..de92c6f17f03 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequest2Test.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequest2Test.java @@ -6,7 +6,7 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.LocalDynamoDBTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequestTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequestTest.java index 1f150a9aecac..7f0b8b67a51b 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequestTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/GenerateCreateTableRequestTest.java @@ -14,7 +14,7 @@ import com.amazonaws.auth.AnonymousAWSCredentials; import com.amazonaws.dynamodbv2.test.util.DynamoDBTestBase; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.GlobalSecondaryIndex; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/HashKeyOnlyTableWithGSITest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/HashKeyOnlyTableWithGSITest.java index 5808fd6d7296..caa3e535014c 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/HashKeyOnlyTableWithGSITest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/HashKeyOnlyTableWithGSITest.java @@ -4,13 +4,13 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.LocalDynamoDBTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.PaginatedQueryList; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.PaginatedQueryList; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyAttributesIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyAttributesIntegrationTest.java index 94fea6b7bc5e..750dd210726a 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyAttributesIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyAttributesIntegrationTest.java @@ -31,11 +31,11 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; import com.amazonaws.services.dynamodbv2.model.Condition; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyClass.java index 60b1eacfffd5..bbc853a5a71f 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/IndexRangeKeyClass.java @@ -17,12 +17,12 @@ import java.math.BigDecimal; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; /** * Comprehensive domain class diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/InheritanceIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/InheritanceIntegrationTest.java index cc9eedde7de2..0c901c044acd 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/InheritanceIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/InheritanceIntegrationTest.java @@ -14,21 +14,21 @@ */ package com.amazonaws.services.dynamodbv2.mapper; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; import static org.junit.Assert.assertEquals; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; import java.util.ArrayList; import java.util.List; import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Tests inheritance behavior in DynamoDB mapper. diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/KeyOnlyPutIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/KeyOnlyPutIntegrationTest.java index f2bf994f85a1..533de78c37ce 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/KeyOnlyPutIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/KeyOnlyPutIntegrationTest.java @@ -12,11 +12,11 @@ import org.junit.Test; import com.amazonaws.dynamodbv2.test.util.DynamoDBIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBSaveExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ConditionalCheckFailedException; import com.amazonaws.services.dynamodbv2.model.ExpectedAttributeValue; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperLoadingStrategyConfigTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperLoadingStrategyConfigTest.java index 13b19ac0bd24..1152c80d9ca3 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperLoadingStrategyConfigTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperLoadingStrategyConfigTest.java @@ -12,13 +12,13 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.PaginationLoadingStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBScanExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.PaginatedList; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.PaginationLoadingStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBScanExpression; +import software.amazon.awssdk.mapper.dynamodb.PaginatedList; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; import com.amazonaws.services.dynamodbv2.model.Condition; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperQueryExpressionTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperQueryExpressionTest.java index 77b4ff88f714..ce224ba429cc 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperQueryExpressionTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperQueryExpressionTest.java @@ -14,15 +14,15 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; import com.amazonaws.services.dynamodbv2.AbstractAmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; import com.amazonaws.services.dynamodbv2.model.Condition; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperSaveConfigTestBase.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperSaveConfigTestBase.java index 5e4f4387c035..34f4a26db1b5 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperSaveConfigTestBase.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/MapperSaveConfigTestBase.java @@ -1,23 +1,23 @@ package com.amazonaws.services.dynamodbv2.mapper; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior.APPEND_SET; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior.CLOBBER; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior.PUT; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior.UPDATE; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior.APPEND_SET; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior.CLOBBER; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior.PUT; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior.UPDATE; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior.UPDATE_SKIP_NULL_ATTRIBUTES; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import com.amazonaws.dynamodbv2.test.util.DynamoDBIntegrationTestBase; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.KeySchemaElement; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NoSuchTableClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NoSuchTableClass.java index ff3b750cc723..5cfea3361607 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NoSuchTableClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NoSuchTableClass.java @@ -14,8 +14,8 @@ * permissions and limitations under the License. */ package com.amazonaws.services.dynamodbv2.mapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "tableNotExist") public class NoSuchTableClass { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberAttributeClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberAttributeClass.java index cbe24ad0e376..e8d800afa339 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberAttributeClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberAttributeClass.java @@ -19,11 +19,11 @@ import java.util.Calendar; import java.util.Date; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIgnore; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIgnore; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Simple domain class with numeric attributes diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberSetAttributeClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberSetAttributeClass.java index ec58a0e85c2e..781230007a24 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberSetAttributeClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumberSetAttributeClass.java @@ -20,9 +20,9 @@ import java.util.Date; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Simple domain class with numeric attributes diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumericSetAttributesIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumericSetAttributesIntegrationTest.java index e4b733cfb355..f22ebe639469 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumericSetAttributesIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/NumericSetAttributesIntegrationTest.java @@ -33,7 +33,7 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.PutItemRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/QueryIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/QueryIntegrationTest.java index 17e4ae9a05b5..34b7e001408e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/QueryIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/QueryIntegrationTest.java @@ -6,11 +6,11 @@ import static org.junit.Assert.fail; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.QueryResultPage; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; +import software.amazon.awssdk.mapper.dynamodb.QueryResultPage; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; import com.amazonaws.services.dynamodbv2.model.Condition; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/RangeKeyAttributesIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/RangeKeyAttributesIntegrationTest.java index e54f7871cbb8..bdc4f77afc61 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/RangeKeyAttributesIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/RangeKeyAttributesIntegrationTest.java @@ -27,7 +27,7 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.PutItemRequest; import com.amazonaws.services.dynamodbv2.pojos.RangeKeyClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScalarAttributeIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScalarAttributeIntegrationTest.java index cb44fed02337..c7ca56ab9077 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScalarAttributeIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScalarAttributeIntegrationTest.java @@ -14,9 +14,9 @@ */ package com.amazonaws.services.dynamodbv2.mapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBScalarAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBScalarAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScanTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScanTest.java index 2d3953bb2f45..4bf7bcb2dab3 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScanTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/ScanTest.java @@ -17,13 +17,13 @@ import org.junit.BeforeClass; import org.junit.Test; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBScanExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.PaginatedParallelScanList; -import com.amazonaws.services.dynamodbv2.datamodeling.PaginatedScanList; -import com.amazonaws.services.dynamodbv2.datamodeling.ScanResultPage; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBScanExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.PaginatedParallelScanList; +import software.amazon.awssdk.mapper.dynamodb.PaginatedScanList; +import software.amazon.awssdk.mapper.dynamodb.ScanResultPage; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.ComparisonOperator; import com.amazonaws.services.dynamodbv2.model.Condition; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleNumericAttributesIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleNumericAttributesIntegrationTest.java index 224e9759978e..b585c9da1777 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleNumericAttributesIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleNumericAttributesIntegrationTest.java @@ -31,7 +31,7 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; import com.amazonaws.services.dynamodbv2.model.GetItemResult; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleStringAttributesIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleStringAttributesIntegrationTest.java index 59bf9c5c2f0b..57e45f69acd2 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleStringAttributesIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/SimpleStringAttributesIntegrationTest.java @@ -26,12 +26,12 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.PutItemRequest; import com.amazonaws.services.dynamodbv2.pojos.StringAttributeClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/StringSetAttributesIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/StringSetAttributesIntegrationTest.java index 0fc52cfe0586..00c16ad1339a 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/StringSetAttributesIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/StringSetAttributesIntegrationTest.java @@ -26,7 +26,7 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.PutItemRequest; import com.amazonaws.services.dynamodbv2.pojos.StringSetAttributeClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TableMapperIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TableMapperIntegrationTest.java index bb96d84b880a..587486dac764 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TableMapperIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TableMapperIntegrationTest.java @@ -18,11 +18,11 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTableMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTableMapper; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; import com.amazonaws.services.dynamodbv2.model.ConditionalCheckFailedException; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadMixedTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadMixedTest.java index e9bef58e588e..1d5ab95d743f 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadMixedTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadMixedTest.java @@ -15,9 +15,9 @@ */ package com.amazonaws.services.dynamodbv2.mapper; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameOverride; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ObjectTableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameOverride; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ObjectTableNameResolver; import static com.amazonaws.services.dynamodbv2.pojos.CustomBooleanClass.CustomBoolean; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createAllSupportedAnnotationsTable; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createMultipleObjectTestDataForTransactionLoad; @@ -39,13 +39,13 @@ import static org.junit.Assert.fail; import static org.junit.Assert.assertEquals; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverterFactory; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionLoadRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverter; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverterFactory; +import software.amazon.awssdk.mapper.dynamodb.TransactionLoadRequest; import com.amazonaws.services.dynamodbv2.pojos.AllSupportedAnnotationsClass; import com.amazonaws.services.dynamodbv2.pojos.AllSupportedDataTypesClass; import com.amazonaws.services.dynamodbv2.model.ResourceNotFoundException; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadSanityTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadSanityTest.java index ce05ce842cde..0e753fc3424b 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadSanityTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadSanityTest.java @@ -21,7 +21,7 @@ import static com.amazonaws.services.dynamodbv2.TestObjectCreator.TransactionLoadTestData; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.TransactionLoadTestDataRequest; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionLoadRequest; +import software.amazon.awssdk.mapper.dynamodb.TransactionLoadRequest; import com.amazonaws.services.dynamodbv2.pojos.StringAttributeClass; import org.junit.Test; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadTableMapperTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadTableMapperTest.java index 38ed6fcb30a4..731212a8d759 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadTableMapperTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionLoadTableMapperTest.java @@ -15,8 +15,8 @@ */ package com.amazonaws.services.dynamodbv2.mapper; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameOverride; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameOverride; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameResolver; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createMultipleObjectTestDataForTransactionLoad; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createSdkRangeTestTable; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.deleteTestTable; @@ -31,11 +31,11 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTableMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionLoadRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTableMapper; +import software.amazon.awssdk.mapper.dynamodb.TransactionLoadRequest; import com.amazonaws.services.dynamodbv2.model.TransactionCanceledException; import com.amazonaws.services.dynamodbv2.pojos.RangeKeyClass; import com.amazonaws.services.dynamodbv2.pojos.SchemaViolatingTestItem; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMiscellaneousTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMiscellaneousTest.java index 314488a0a827..23a27cc6d4c9 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMiscellaneousTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMiscellaneousTest.java @@ -29,9 +29,9 @@ import static com.amazonaws.services.dynamodbv2.TestObjectCreator.getSlimAttributeNamesClass; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.updateTransactionWriteOperationsWithNewObject; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.updateTransactionWriteOperationsWithNewObjectAndExpression; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.builder; -import static com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest.TransactionWriteOperation; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.builder; +import static software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest.TransactionWriteOperation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -43,13 +43,13 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.TestObjectCreator; import com.amazonaws.services.dynamodbv2.TestObjectCreator.TransactionWriteTestRequest; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTransactionWriteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.PaginatedQueryList; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBQueryExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTransactionWriteExpression; +import software.amazon.awssdk.mapper.dynamodb.PaginatedQueryList; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest; import com.amazonaws.services.dynamodbv2.model.AttributeDefinition; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMixedTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMixedTest.java index 94dafd18a274..9258d4bbed58 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMixedTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteMixedTest.java @@ -33,11 +33,11 @@ import static com.amazonaws.services.dynamodbv2.TestObjectCreator.getStringHashAndRangeKeyObjectWithKeys; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.getTestItemObject; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.updateTransactionWriteOperationsWithNewObject; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ObjectTableNameResolver; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameOverride; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.builder; -import static com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest.TransactionWriteOperation; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ObjectTableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameOverride; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.builder; +import static software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest.TransactionWriteOperation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertTrue; @@ -49,14 +49,14 @@ import java.util.Map; import java.util.UUID; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTransactionWriteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverterFactory; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTransactionWriteExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverter; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverterFactory; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.GetItemResult; import com.amazonaws.services.dynamodbv2.pojos.CustomBooleanClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteSanityTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteSanityTest.java index 0eede8de605d..de7f62d269cc 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteSanityTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteSanityTest.java @@ -30,8 +30,8 @@ import java.util.Arrays; import java.util.List; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTransactionWriteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTransactionWriteExpression; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest; import com.amazonaws.services.dynamodbv2.model.TransactionCanceledException; import com.amazonaws.services.dynamodbv2.pojos.HashKeyRangeKeyClass; import com.amazonaws.services.dynamodbv2.pojos.StringAttributeClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteTableMapperTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteTableMapperTest.java index 6bfbcb564d7a..1effefd689e4 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteTableMapperTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteTableMapperTest.java @@ -15,7 +15,7 @@ */ package com.amazonaws.services.dynamodbv2.mapper; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameResolver; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.ConditionExpressionMode; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createMultipleObjectTestDataForTransactionWrite; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createStringHashKeyTable; @@ -30,13 +30,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTableMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTransactionWriteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionLoadRequest; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTableMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTransactionWriteExpression; +import software.amazon.awssdk.mapper.dynamodb.TransactionLoadRequest; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.CancellationReason; import com.amazonaws.services.dynamodbv2.model.TransactionCanceledException; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteVersionAttributeTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteVersionAttributeTest.java index 6164ba8cbf61..892cba740ea1 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteVersionAttributeTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionWriteVersionAttributeTest.java @@ -22,8 +22,8 @@ import com.amazonaws.SdkClientException; import com.amazonaws.services.dynamodbv2.TestObjectCreator; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTransactionWriteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTransactionWriteExpression; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest; import com.amazonaws.services.dynamodbv2.model.TransactionCanceledException; import com.amazonaws.services.dynamodbv2.pojos.MultiVersionRangeKeyClass; import com.amazonaws.services.dynamodbv2.pojos.RangeKeyClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionsTestBase.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionsTestBase.java index fe726df6b053..350bcc61d674 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionsTestBase.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TransactionsTestBase.java @@ -20,7 +20,7 @@ import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createSdkRangeTestTable; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createSdkStringRangeTable; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createStringHashKeyTable; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameResolver; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameResolver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -29,10 +29,10 @@ import java.util.List; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionLoadRequest; -import com.amazonaws.services.dynamodbv2.datamodeling.TransactionWriteRequest; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.TransactionLoadRequest; +import software.amazon.awssdk.mapper.dynamodb.TransactionWriteRequest; import com.amazonaws.services.dynamodbv2.model.TransactionCanceledException; import com.amazonaws.services.dynamodbv2.pojos.HashKeyAutoGenerated; import com.amazonaws.services.dynamodbv2.pojos.HashKeyRangeKeyBothAutoGenerated; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonIntegrationTest.java index 5d6016cebb51..079418fa9dd8 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonIntegrationTest.java @@ -17,10 +17,10 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedJson; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedJson; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; import com.amazonaws.services.dynamodbv2.pojos.Currency; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonTest.java index 73fb6102f3ee..209ad1bec43d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedJsonTest.java @@ -15,10 +15,10 @@ package com.amazonaws.services.dynamodbv2.mapper; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedJson; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedJson; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; import com.amazonaws.services.dynamodbv2.model.GetItemResult; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedTimestampIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedTimestampIntegrationTest.java index 46fc7d473918..daad769618e9 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedTimestampIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConvertedTimestampIntegrationTest.java @@ -16,11 +16,11 @@ import static org.junit.Assert.assertEquals; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedTimestamp; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; import com.amazonaws.services.dynamodbv2.pojos.Currency; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConverterIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConverterIntegrationTest.java index 5da7824d2ed9..a963322c502d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConverterIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypeConverterIntegrationTest.java @@ -18,13 +18,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDocument; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverted; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConverter; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBDocument; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverted; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConverter; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; import com.amazonaws.services.dynamodbv2.pojos.Currency; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypedIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypedIntegrationTest.java index c632f38d56e6..a882412f1b4c 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypedIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/TypedIntegrationTest.java @@ -16,12 +16,12 @@ import static org.junit.Assert.assertEquals; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedDefault; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTyped; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedDefault; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTyped; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/V2CompatibleBooleansTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/V2CompatibleBooleansTest.java index 1f73afbcab3c..018d117bb1c7 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/V2CompatibleBooleansTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/V2CompatibleBooleansTest.java @@ -15,16 +15,16 @@ package com.amazonaws.services.dynamodbv2.mapper; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.ConversionSchema; -import com.amazonaws.services.dynamodbv2.datamodeling.ConversionSchemas; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTyped; +import software.amazon.awssdk.mapper.dynamodb.ConversionSchema; +import software.amazon.awssdk.mapper.dynamodb.ConversionSchemas; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTyped; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.GetItemRequest; import com.amazonaws.services.dynamodbv2.model.GetItemResult; @@ -125,7 +125,7 @@ public void saveBooleanUsingV2Schema_MarshallsIntoNativeBool() { } /** - * {@link com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBNativeBoolean} or {@link DynamoDBTyped} can force native + * {@link software.amazon.awssdk.mapper.dynamodb.DynamoDBNativeBoolean} or {@link DynamoDBTyped} can force native * boolean marshalling. */ @Test diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/VersionAttributeUpdateIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/VersionAttributeUpdateIntegrationTest.java index c6cf4ba03729..fea878e39179 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/VersionAttributeUpdateIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/mapper/VersionAttributeUpdateIntegrationTest.java @@ -14,7 +14,7 @@ */ package com.amazonaws.services.dynamodbv2.mapper; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads.CONSISTENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -22,16 +22,16 @@ import static org.junit.Assert.fail; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDeleteExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMappingException; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBSaveExpression; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBDeleteExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMappingException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBSaveExpression; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.ConditionalCheckFailedException; import com.amazonaws.services.dynamodbv2.model.ConditionalOperator; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedAnnotationsClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedAnnotationsClass.java index 0bdb95ed8f80..64d7ea4ec19e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedAnnotationsClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedAnnotationsClass.java @@ -15,22 +15,22 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedDefault; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBConvertedBool; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDelimited; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBFlattened; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBGeneratedUuid; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIgnore; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBKeyed; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBNamed; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedJson; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTypeConvertedEpochDate; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedDefault; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBConvertedBool; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBDelimited; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBFlattened; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBGeneratedUuid; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIgnore; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBKeyed; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBNamed; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedJson; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTypeConvertedEpochDate; import com.amazonaws.services.dynamodbv2.model.KeyType; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedDataTypesClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedDataTypesClass.java index be940ee7369b..7af8614a4dfb 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedDataTypesClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AllSupportedDataTypesClass.java @@ -21,9 +21,9 @@ import java.util.Date; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Exhaustive exercise of DynamoDB domain mapping, exercising every supported diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AuditRecord.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AuditRecord.java index cb20884a74f8..bb5ea6ad00a9 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AuditRecord.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AuditRecord.java @@ -14,11 +14,11 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBFlattened; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBFlattened; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; import java.util.Date; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AutoKeyAndVal.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AutoKeyAndVal.java index 5998e413976b..fc32b98ed898 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AutoKeyAndVal.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/AutoKeyAndVal.java @@ -14,9 +14,9 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Auto-generated string key and value. diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteArrayClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteArrayClass.java index 9cea727c3a94..98c82fb30261 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteArrayClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteArrayClass.java @@ -16,9 +16,9 @@ import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Test domain class with byte[] attribute, byte[] set and a string key diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteBufferClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteBufferClass.java index b419f1548bfe..99a1fe91950f 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteBufferClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/BinaryAttributeByteBufferClass.java @@ -17,9 +17,9 @@ import java.nio.ByteBuffer; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Test domain class with byteBuffer attribute, byteBuffer set and a string key diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CrossSDKVerificationClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CrossSDKVerificationClass.java index 753d77cc26de..d5a8ca7c2d1b 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CrossSDKVerificationClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CrossSDKVerificationClass.java @@ -20,10 +20,10 @@ import java.util.Date; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; /** * Exhaustive exercise of DynamoDB domain mapping, exercising every supported diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CustomBooleanClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CustomBooleanClass.java index 8c246264c9e9..e2547c7d4089 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CustomBooleanClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/CustomBooleanClass.java @@ -15,12 +15,12 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import static com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import static software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTyped; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTyped; @DynamoDBTable(tableName = "custom-boolean-class") public class CustomBooleanClass { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/GsiWithAlwaysUpdateTimestamp.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/GsiWithAlwaysUpdateTimestamp.java index 66dd12bf25d4..2a2efa752495 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/GsiWithAlwaysUpdateTimestamp.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/GsiWithAlwaysUpdateTimestamp.java @@ -14,13 +14,13 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "Foo") public class GsiWithAlwaysUpdateTimestamp { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyAutoGenerated.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyAutoGenerated.java index c634caee6808..2ff76f19e7aa 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyAutoGenerated.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyAutoGenerated.java @@ -15,10 +15,10 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "aws-java-sdk-string-range") public class HashKeyAutoGenerated { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyBothAutoGenerated.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyBothAutoGenerated.java index 944ab31d04af..a571a518082e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyBothAutoGenerated.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyBothAutoGenerated.java @@ -15,10 +15,10 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "aws-java-sdk-string-range") public class HashKeyRangeKeyBothAutoGenerated { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyClass.java index 40549912b629..09782347125c 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashKeyRangeKeyClass.java @@ -15,10 +15,10 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "aws-java-sdk-hash-range-test") public class HashKeyRangeKeyClass { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashRangeAndOtherAttributeAutoGen.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashRangeAndOtherAttributeAutoGen.java index 1a1baf8aa396..ef2a04534827 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashRangeAndOtherAttributeAutoGen.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/HashRangeAndOtherAttributeAutoGen.java @@ -17,12 +17,12 @@ import java.util.Date; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "aws-java-sdk-hash-range-test") public class HashRangeAndOtherAttributeAutoGen { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/MultiVersionRangeKeyClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/MultiVersionRangeKeyClass.java index 1ef1976d7278..60abbb49b1e9 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/MultiVersionRangeKeyClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/MultiVersionRangeKeyClass.java @@ -15,7 +15,7 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; public class MultiVersionRangeKeyClass extends RangeKeyClass { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_IndexKeysAutogenerated.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_IndexKeysAutogenerated.java index 25b14e543ae5..fe4261f4fc7d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_IndexKeysAutogenerated.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_IndexKeysAutogenerated.java @@ -15,12 +15,12 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIndexRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBIndexRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "aws-java-sdk-string-range") public class PrimaryKeysNotAutogenerated_IndexKeysAutogenerated { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_OtherAttributeAutogenerated.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_OtherAttributeAutogenerated.java index d35d8727df91..1cd84079b356 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_OtherAttributeAutogenerated.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/PrimaryKeysNotAutogenerated_OtherAttributeAutogenerated.java @@ -17,12 +17,12 @@ import java.util.Date; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerateStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGenerated; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedTimestamp; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerateStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGenerated; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedTimestamp; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "aws-java-sdk-string-range") public class PrimaryKeysNotAutogenerated_OtherAttributeAutogenerated { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/RangeKeyClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/RangeKeyClass.java index 4e7b8396cff4..f22cd17f9cb9 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/RangeKeyClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/RangeKeyClass.java @@ -17,11 +17,11 @@ import java.math.BigDecimal; import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBVersionAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBVersionAttribute; /** * Comprehensive domain class diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/S3LinksTestClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/S3LinksTestClass.java index 02b4248778fd..eeee56e466b0 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/S3LinksTestClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/S3LinksTestClass.java @@ -14,9 +14,9 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.S3Link; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.S3Link; /** * Test domain class with a single string key, and two S3Links diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SchemaViolatingTestItem.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SchemaViolatingTestItem.java index cb2be160008b..9017faed8eca 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SchemaViolatingTestItem.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SchemaViolatingTestItem.java @@ -15,9 +15,9 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * This class has same name has TestItem but different hashKeyName. This will diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SlimAttributeNamesClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SlimAttributeNamesClass.java index 17d82c10b797..c759337f1a3d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SlimAttributeNamesClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SlimAttributeNamesClass.java @@ -15,10 +15,10 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = "aws-java-sdk-dynamodb-mapper-save-config-test") public class SlimAttributeNamesClass { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringAttributeClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringAttributeClass.java index ca55b920fc16..8b9ed3d5f2d8 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringAttributeClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringAttributeClass.java @@ -14,9 +14,9 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Test domain class with a single string attribute and a string key diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringSetAttributeClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringSetAttributeClass.java index 1a595c6ddf94..97ec5f50b10f 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringSetAttributeClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/StringSetAttributeClass.java @@ -16,9 +16,9 @@ import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Test domain class with a string set attribute and a string key diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SubClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SubClass.java index f853d35898c2..6ef918ebe3aa 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SubClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/SubClass.java @@ -14,7 +14,7 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDocument; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBDocument; import java.nio.ByteBuffer; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestClass.java index 327816efe18d..dd5507614e3d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestClass.java @@ -14,12 +14,12 @@ */ package com.amazonaws.services.dynamodbv2.pojos; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshalling; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBNativeBoolean; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; -import com.amazonaws.services.dynamodbv2.datamodeling.RandomUUIDMarshaller; -import com.amazonaws.services.dynamodbv2.datamodeling.S3Link; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMarshalling; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBNativeBoolean; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.RandomUUIDMarshaller; +import software.amazon.awssdk.mapper.dynamodb.S3Link; import java.math.BigDecimal; import java.math.BigInteger; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestDocClass.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestDocClass.java index 7bee4d02dd71..0438004fa389 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestDocClass.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestDocClass.java @@ -18,9 +18,9 @@ import java.util.List; import java.util.Map; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBDocument; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBDocument; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName="aws-java-sdk-doc-attribute-table") public class TestDocClass { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestItem.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestItem.java index 2e9808b06853..9b4cc33da839 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestItem.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/pojos/TestItem.java @@ -17,10 +17,10 @@ import java.util.Set; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBRangeKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAttribute; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBRangeKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; @DynamoDBTable(tableName = TestItem.TABLE_NAME) public class TestItem { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/AttributeAdder.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/AttributeAdder.java index 8da731a63399..f3f8f4ba0888 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/AttributeAdder.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/AttributeAdder.java @@ -16,7 +16,7 @@ package com.amazonaws.services.dynamodbv2.utils; -import com.amazonaws.services.dynamodbv2.datamodeling.AttributeTransformer; +import software.amazon.awssdk.mapper.dynamodb.AttributeTransformer; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import java.util.HashMap; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/NullAttributeAdder.java b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/NullAttributeAdder.java index a9a5f38a0524..b95b2d0af2ff 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/NullAttributeAdder.java +++ b/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/utils/NullAttributeAdder.java @@ -16,7 +16,7 @@ package com.amazonaws.services.dynamodbv2.utils; -import com.amazonaws.services.dynamodbv2.datamodeling.AttributeTransformer; +import software.amazon.awssdk.mapper.dynamodb.AttributeTransformer; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import java.util.HashMap; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformerChainTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformerChainTest.java similarity index 97% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformerChainTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformerChainTest.java index 7d6219a94344..e7892b83c853 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/AttributeTransformerChainTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/AttributeTransformerChainTest.java @@ -12,13 +12,13 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.*; import org.junit.*; -import com.amazonaws.services.dynamodbv2.datamodeling.AttributeTransformer.Parameters; +import software.amazon.awssdk.mapper.dynamodb.AttributeTransformer.Parameters; import com.amazonaws.services.dynamodbv2.model.AttributeValue; public class AttributeTransformerChainTest { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadRetryStrategyTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadRetryStrategyTest.java similarity index 94% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadRetryStrategyTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadRetryStrategyTest.java index 2c130622ffde..e445b209780e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadRetryStrategyTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadRetryStrategyTest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.easymock.EasyMock.anyObject; import static org.easymock.EasyMock.createMock; @@ -41,8 +41,8 @@ import com.amazonaws.services.dynamodbv2.model.KeysAndAttributes; import com.amazonaws.services.dynamodbv2.model.PutRequest; import com.amazonaws.services.dynamodbv2.model.WriteRequest; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchLoadRetryStrategy; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper.BatchGetItemException; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchLoadRetryStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.BatchGetItemException; public class BatchLoadRetryStrategyTest { @@ -194,7 +194,7 @@ public BatchLoadRetryStrategyWithNoDelay(final int maxRetry) { } /* (non-Javadoc) - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchLoadRetryStrategy#getMaxRetryOnUnprocessedKeys(java.util.Map, java.util.Map) + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchLoadRetryStrategy#getMaxRetryOnUnprocessedKeys(java.util.Map, java.util.Map) */ @Override public boolean shouldRetry(final BatchLoadContext batchLoadContext) { @@ -202,7 +202,7 @@ public boolean shouldRetry(final BatchLoadContext batchLoadContext) { } /* (non-Javadoc) - * @see com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchLoadRetryStrategy#getDelayBeforeNextRetry(java.util.Map, int) + * @see software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchLoadRetryStrategy#getDelayBeforeNextRetry(java.util.Map, int) */ @Override public long getDelayBeforeNextRetry(final BatchLoadContext batchLoadContext) { diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadTest.java similarity index 97% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadTest.java index 6a590cfc0431..cfc8c751ac5c 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchLoadTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchLoadTest.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -20,8 +20,8 @@ import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.LocalDynamoDBTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.SaveBehavior; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.SaveBehavior; import com.amazonaws.services.dynamodbv2.mapper.NumberSetAttributeClass; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.pojos.RangeKeyClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchWriteRetryStrategyTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchWriteRetryStrategyTest.java similarity index 96% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchWriteRetryStrategyTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchWriteRetryStrategyTest.java index 200bd76f0cea..59e0fa088a55 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/BatchWriteRetryStrategyTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/BatchWriteRetryStrategyTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.Arrays; import java.util.Collections; @@ -33,8 +33,8 @@ import static org.easymock.EasyMock.verify; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper.FailedBatch; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.BatchWriteRetryStrategy; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.FailedBatch; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.BatchWriteRetryStrategy; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.model.BatchWriteItemRequest; import com.amazonaws.services.dynamodbv2.model.BatchWriteItemResult; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/CachingMarshallerSetTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/CachingMarshallerSetTest.java similarity index 91% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/CachingMarshallerSetTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/CachingMarshallerSetTest.java index 38b69b5ebcf5..3060f0336e50 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/CachingMarshallerSetTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/CachingMarshallerSetTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; import java.lang.reflect.Type; @@ -22,8 +22,8 @@ import org.junit.Assert; import org.junit.Test; -import com.amazonaws.services.dynamodbv2.datamodeling.ConversionSchemas.CachingMarshallerSet; -import com.amazonaws.services.dynamodbv2.datamodeling.ConversionSchemas.MarshallerSet; +import software.amazon.awssdk.mapper.dynamodb.ConversionSchemas.CachingMarshallerSet; +import software.amazon.awssdk.mapper.dynamodb.ConversionSchemas.MarshallerSet; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.pojos.TestClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/CachingUnmarshallerSetTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/CachingUnmarshallerSetTest.java similarity index 92% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/CachingUnmarshallerSetTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/CachingUnmarshallerSetTest.java index 901b6456fd54..22438bf1daf3 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/CachingUnmarshallerSetTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/CachingUnmarshallerSetTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; import java.lang.reflect.Type; @@ -22,8 +22,8 @@ import org.junit.Assert; import org.junit.Test; -import com.amazonaws.services.dynamodbv2.datamodeling.ConversionSchemas.CachingUnmarshallerSet; -import com.amazonaws.services.dynamodbv2.datamodeling.ConversionSchemas.UnmarshallerSet; +import software.amazon.awssdk.mapper.dynamodb.ConversionSchemas.CachingUnmarshallerSet; +import software.amazon.awssdk.mapper.dynamodb.ConversionSchemas.UnmarshallerSet; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import com.amazonaws.services.dynamodbv2.pojos.TestClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/ConfigureS3LinksTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/ConfigureS3LinksTest.java similarity index 98% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/ConfigureS3LinksTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/ConfigureS3LinksTest.java index 249384532f2f..99b070268d47 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/ConfigureS3LinksTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/ConfigureS3LinksTest.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionToAttributeValuesTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/ConversionToAttributeValuesTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionToAttributeValuesTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/ConversionToAttributeValuesTest.java index faaa34d0b460..7dacdbb1ba90 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/ConversionToAttributeValuesTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/ConversionToAttributeValuesTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.model.AttributeValue; import org.junit.Before; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfigTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperConfigTest.java similarity index 97% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfigTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperConfigTest.java index 18cbdef5117e..e23b835d9bd7 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfigTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperConfigTest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertNotNull; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperExpressionsIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperExpressionsIntegrationTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperExpressionsIntegrationTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperExpressionsIntegrationTest.java index d71234824415..d2dece1b7fae 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperExpressionsIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBMapperExpressionsIntegrationTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertTrue; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBS3IntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTest.java similarity index 98% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBS3IntegrationTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTest.java index 6675a534c687..09c6c942672d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBS3IntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTest.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBS3IntegrationTestBase.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTestBase.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBS3IntegrationTestBase.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTestBase.java index 6a6da5b239de..336ba02966b1 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBS3IntegrationTestBase.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/DynamoDBS3IntegrationTestBase.java @@ -11,7 +11,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.fail; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/EnumMarshallerIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/EnumMarshallerIntegrationTest.java similarity index 88% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/EnumMarshallerIntegrationTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/EnumMarshallerIntegrationTest.java index 670efbf6e111..3ed7a4e4c3c4 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/EnumMarshallerIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/EnumMarshallerIntegrationTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,10 +21,10 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshalling; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMarshalling; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Status tests for {@code EnumMarshaller}. diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/GenerateDeleteTableRequestTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java similarity index 97% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/GenerateDeleteTableRequestTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java index 21bdeb28f57d..6e58286589eb 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/GenerateDeleteTableRequestTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/GenerateDeleteTableRequestTest.java @@ -13,7 +13,7 @@ * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/IncompatibleSubclassTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/IncompatibleSubclassTest.java similarity index 97% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/IncompatibleSubclassTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/IncompatibleSubclassTest.java index 77f4ce08bf0d..592303d6fff2 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/IncompatibleSubclassTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/IncompatibleSubclassTest.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java similarity index 94% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonIntegrationTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java index dad246bc4637..c27c9dee74ec 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonIntegrationTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.Arrays; import java.util.Collections; @@ -28,8 +28,8 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.ConsistentReads; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperConfig.TableNameOverride; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.ConsistentReads; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperConfig.TableNameOverride; import com.amazonaws.services.dynamodbv2.model.CreateTableRequest; import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput; import com.amazonaws.services.dynamodbv2.model.ResourceNotFoundException; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonMarshallerIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonMarshallerIntegrationTest.java similarity index 95% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonMarshallerIntegrationTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonMarshallerIntegrationTest.java index bed5d3fdb527..7e7565003493 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/JsonMarshallerIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/JsonMarshallerIntegrationTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -26,10 +26,10 @@ import org.junit.Test; import com.amazonaws.services.dynamodbv2.DynamoDBMapperIntegrationTestBase; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAutoGeneratedKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMarshalling; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBAutoGeneratedKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBHashKey; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMarshalling; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBTable; /** * Status tests for {@code JsonMarshaller}. diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedScanTaskTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/PaginatedScanTaskTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedScanTaskTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/PaginatedScanTaskTest.java index 6cb25679bb32..89522fa294ed 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/PaginatedScanTaskTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/PaginatedScanTaskTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.AmazonDynamoDB; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/RandomUUIDMarshaller.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/RandomUUIDMarshaller.java similarity index 95% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/RandomUUIDMarshaller.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/RandomUUIDMarshaller.java index 812c1c8c85bb..f35bdece8ba6 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/RandomUUIDMarshaller.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/RandomUUIDMarshaller.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.UUID; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3ClientCacheIntegrationTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3ClientCacheIntegrationTest.java similarity index 98% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3ClientCacheIntegrationTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3ClientCacheIntegrationTest.java index 4d24b5824acb..f394e1f5c86d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3ClientCacheIntegrationTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3ClientCacheIntegrationTest.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3LinkIDTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3LinkIDTest.java similarity index 96% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3LinkIDTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3LinkIDTest.java index 1754cf004402..31d9edc4bb14 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3LinkIDTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3LinkIDTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3LinkTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3LinkTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3LinkTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3LinkTest.java index c2b6ecb724e0..991574cee214 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/S3LinkTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/S3LinkTest.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesOverrideTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesOverrideTest.java similarity index 96% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesOverrideTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesOverrideTest.java index 1b96e6bf51a6..92192abd9807 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesOverrideTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesOverrideTest.java @@ -12,7 +12,7 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.services.dynamodbv2.model.AttributeValue; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesTest.java index 4e68b1931b41..a113aeb2b25d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesTest.java @@ -12,12 +12,12 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapperFieldModel.DynamoDBAttributeType; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapperFieldModel.DynamoDBAttributeType; import com.amazonaws.services.dynamodbv2.pojos.AutoKeyAndVal; import com.amazonaws.services.dynamodbv2.pojos.Currency; import com.amazonaws.services.dynamodbv2.pojos.DateRange; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV1Test.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV1Test.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV1Test.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV1Test.java index 9539d5226ea1..e040a9f85f12 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV1Test.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV1Test.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2CompatibleTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2CompatibleTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2CompatibleTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2CompatibleTest.java index cacd18178002..43307b4be07c 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2CompatibleTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2CompatibleTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2Test.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2Test.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2Test.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2Test.java index 91058e5edb9b..cf23190fe060 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2Test.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2Test.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2UnconvertTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2UnconvertTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2UnconvertTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2UnconvertTest.java index 0bb91c48e50c..c1037f05a40d 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StandardModelFactoriesV2UnconvertTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StandardModelFactoriesV2UnconvertTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StringListMapTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StringListMapTest.java similarity index 95% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StringListMapTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StringListMapTest.java index 3c6207932dc7..dca1acc4a32e 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/StringListMapTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/StringListMapTest.java @@ -12,11 +12,11 @@ * License for the specific language governing permissions and * limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static org.junit.Assert.assertEquals; -import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper.StringListMap; +import software.amazon.awssdk.mapper.dynamodb.DynamoDBMapper.StringListMap; import java.util.List; import java.util.Map.Entry; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TestParameters.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TestParameters.java similarity index 96% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TestParameters.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TestParameters.java index 9dc74a569da2..39d90aee670a 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TestParameters.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TestParameters.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.util.Map; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadTableMapperUnitTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadTableMapperUnitTest.java similarity index 98% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadTableMapperUnitTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadTableMapperUnitTest.java index 6a27460d5fc9..8e0c6a68a8db 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadTableMapperUnitTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadTableMapperUnitTest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createSdkRangeTestTable; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.getStringAttributeClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadUnitTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadUnitTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadUnitTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadUnitTest.java index e174f688c0ca..ca569508db0a 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionLoadUnitTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionLoadUnitTest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.DEFAULT_PROVISIONED_THROUGHPUT; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createSdkMapperSaveConfigTable; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteTableMapperUnitTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteTableMapperUnitTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteTableMapperUnitTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteTableMapperUnitTest.java index 0e2cee7551cb..ad8200152235 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteTableMapperUnitTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteTableMapperUnitTest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createStringHashKeyTable; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.getStringAttributeClass; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteUnitTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteUnitTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteUnitTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteUnitTest.java index ef1e93372b8a..482a3d13327f 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionWriteUnitTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionWriteUnitTest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.DEFAULT_PROVISIONED_THROUGHPUT; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.createSdkDocAttributeTable; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionsUnitTestBase.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionsUnitTestBase.java similarity index 98% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionsUnitTestBase.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionsUnitTestBase.java index aaef25a6fb5d..38d300877327 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/TransactionsUnitTestBase.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/TransactionsUnitTestBase.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import com.amazonaws.dynamodbv2.test.util.DynamoDBUnitTestBase; import com.amazonaws.services.dynamodbv2.model.CancellationReason; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/UnmarshallerTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/UnmarshallerTest.java similarity index 95% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/UnmarshallerTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/UnmarshallerTest.java index 5205bba12806..c8cf029ab495 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/UnmarshallerTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/UnmarshallerTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V1MarshallerTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V1MarshallerTest.java similarity index 94% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V1MarshallerTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V1MarshallerTest.java index 92e878c4c5f7..b8c1889d79ed 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V1MarshallerTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V1MarshallerTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V2CompatMarshallerTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V2CompatMarshallerTest.java similarity index 95% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V2CompatMarshallerTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V2CompatMarshallerTest.java index b47d9b0a885e..06f7e052d1b8 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V2CompatMarshallerTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V2CompatMarshallerTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V2MarshallerTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V2MarshallerTest.java similarity index 94% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V2MarshallerTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V2MarshallerTest.java index 815c9f29f6b7..bb320cd474f2 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/V2MarshallerTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/V2MarshallerTest.java @@ -12,7 +12,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import java.lang.reflect.Method; diff --git a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/VersionAttributeConditionExpressionGeneratorUnitTest.java b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/VersionAttributeConditionExpressionGeneratorUnitTest.java similarity index 99% rename from services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/VersionAttributeConditionExpressionGeneratorUnitTest.java rename to services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/VersionAttributeConditionExpressionGeneratorUnitTest.java index f4d2bb843d75..2d596f994444 100644 --- a/services-custom/dynamodb-mapper/src/test/java/com/amazonaws/services/dynamodbv2/datamodeling/VersionAttributeConditionExpressionGeneratorUnitTest.java +++ b/services-custom/dynamodb-mapper/src/test/java/software/amazon/awssdk/mapper/dynamodb/VersionAttributeConditionExpressionGeneratorUnitTest.java @@ -13,7 +13,7 @@ * express or implied. See the License for the specific language governing * permissions and limitations under the License. */ -package com.amazonaws.services.dynamodbv2.datamodeling; +package software.amazon.awssdk.mapper.dynamodb; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.getMultiVersionRangeKeyObject; import static com.amazonaws.services.dynamodbv2.TestObjectCreator.getUniqueRangeKeyObject;