Version 1.3.3 of the AWS Java SDK

This release adds support for working with the Amazon Simple Workflow Service, both with a low-level client object, and the high-level AWS Flow Framework. It also resolves several issues with the DynamoDB client and Object Persistence Model.
simonje · Feb 22, 2012 · 0a183e0 · 0a183e0
1 parent 49778f3
commit 0a183e0
Show file tree

Hide file tree

Showing 600 changed files with 90,704 additions and 556 deletions.
diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AWS SDK for Java
 Bundle-SymbolicName: com.amazonaws.sdk;singleton:=true
-Bundle-Version: 1.3.2
+Bundle-Version: 1.3.3
 Bundle-Vendor: Amazon Technologies, Inc
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0",

diff --git a/NOTICE.txt b/NOTICE.txt
@@ -1,5 +1,5 @@
 AWS SDK for Java
-Copyright 2010 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 
 This product includes software developed by
 Amazon Technologies, Inc (http://www.amazon.com/).

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <artifactId>aws-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>AWS SDK for Java</name>
-    <version>1.3.2</version>
+    <version>1.3.3</version>
     <description>The Amazon Web Services SDK for Java provides Java APIs for building software on AWS’ cost-effective, scalable, and reliable infrastructure products. The AWS Java SDK allows developers to code against APIs for all of Amazon's infrastructure web services (Amazon S3, Amazon EC2, Amazon SQS, Amazon Relational Database Service, Amazon AutoScaling, etc).</description>
     <url>http://aws.amazon.com/sdkforjava</url>
 
@@ -64,6 +64,40 @@
         </dependency>
 
 
+        <!-- The Amazon Simple Workflow Java Flow framework
+             requires additional dependencies -->
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>[2.3,)</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>[3.0,)</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>[3.0,)</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>[3.0,)</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjrt</artifactId>
+            <version>[1.6,)</version>
+            <optional>true</optional>
+        </dependency>
+
+
         <!-- JDK 1.6 and above include StAX support by default, so these two dependencies
              are only needed for compiling/running against a 1.5 JVM.  -->
         <dependency>

diff --git a/src/main/java/com/amazonaws/services/dynamodb/datamodeling/DynamoDBMapper.java b/src/main/java/com/amazonaws/services/dynamodb/datamodeling/DynamoDBMapper.java
diff --git a/src/main/java/com/amazonaws/services/dynamodb/datamodeling/DynamoDBReflector.java b/src/main/java/com/amazonaws/services/dynamodb/datamodeling/DynamoDBReflector.java
@@ -90,7 +90,7 @@ Collection<Method> getRelevantGetters(Class<?> clazz) {
     private boolean isRelevantGetter(Method m) {
         return (m.getName().startsWith("get") || m.getName().startsWith("is")) && m.getParameterTypes().length == 0
                 && m.getDeclaringClass().getAnnotation(DynamoDBTable.class) != null
-                && m.getAnnotation(DynamoDBIgnore.class) == null;
+                && !m.isAnnotationPresent(DynamoDBIgnore.class);
     }
 
     /**
@@ -102,7 +102,7 @@ <T> Method getRangeKeyGetter(Class<T> clazz) {
             if ( !rangeKeyGetterCache.containsKey(clazz) ) {
                 Method rangeKeyMethod = null;
                 for ( Method method : getRelevantGetters(clazz) ) {
-                    if ( method.getParameterTypes().length == 0 && method.getAnnotation(DynamoDBRangeKey.class) != null ) {
+                    if ( method.getParameterTypes().length == 0 && method.isAnnotationPresent(DynamoDBRangeKey.class)) {
                         rangeKeyMethod = method;
                         break;
                     }
@@ -121,7 +121,7 @@ <T> Method getHashKeyGetter(Class<T> clazz) {
         synchronized (hashKeyGetterCache) {
             if ( !hashKeyGetterCache.containsKey(clazz) ) {
                 for ( Method method : getRelevantGetters(clazz) ) {
-                    if ( method.getParameterTypes().length == 0 && method.getAnnotation(DynamoDBHashKey.class) != null ) {
+                    if ( method.getParameterTypes().length == 0 && method.isAnnotationPresent(DynamoDBHashKey.class)) {
                         hashKeyGetterCache.put(clazz, method);
                         break;
                     }
@@ -152,7 +152,7 @@ <T> DynamoDBTable getTable(Class<T> clazz) {
      * Returns whether or not this getter has a custom marshaller
      */
     private boolean isCustomMarshaller(Method getter) {
-        return getter.getAnnotation(DynamoDBMarshalling.class) != null;
+        return getter.isAnnotationPresent(DynamoDBMarshalling.class);
     }
 
     /**
@@ -877,7 +877,7 @@ boolean isVersionAttributeGetter(Method getter) {
                 versionAttributeGetterCache.put(
                         getter,
                         getter.getName().startsWith("get") && getter.getParameterTypes().length == 0
-                                && getter.getAnnotation(DynamoDBVersionAttribute.class) != null);
+                                && getter.isAnnotationPresent(DynamoDBVersionAttribute.class));
             }
         }
 
@@ -892,9 +892,9 @@ boolean isAssignableKey(Method getter) {
             if ( !autoGeneratedKeyGetterCache.containsKey(getter) ) {
                 autoGeneratedKeyGetterCache.put(
                         getter,
-                        getter.getAnnotation(DynamoDBAutoGeneratedKey.class) != null
-                                && (getter.getAnnotation(DynamoDBHashKey.class) != null || getter
-                                        .getAnnotation(DynamoDBRangeKey.class) != null));
+                        getter.isAnnotationPresent(DynamoDBAutoGeneratedKey.class)
+                                && (getter.isAnnotationPresent(DynamoDBHashKey.class) || getter
+                                        .isAnnotationPresent(DynamoDBRangeKey.class)));
             }
         }