Pull Request #19. Enabling new schema and bumping version to 2.0.

Author: shorea

pom.xml

@@ -6,7 +6,7 @@
     <artifactId>aws-dynamodb-session-tomcat</artifactId>
     <packaging>jar</packaging>
     <name>Amazon DynamoDB Session Manager for Tomcat</name>
-    <version>1.0.5</version>
+    <version>2.0.0</version>
     <description>The Amazon DynamoDB Session Manager for Tomcat provides a custom session manager for Tomcat 7 that stores session data in Amazon DynamoDB, Amazon's fully managed NoSQL database service.</description>
     <url>https://aws.amazon.com/java</url>
 

src/main/java/com/amazonaws/services/dynamodb/sessionmanager/DynamoDBSessionManager.java

@@ -30,8 +30,8 @@
 import com.amazonaws.auth.PropertiesCredentials;
 import com.amazonaws.internal.StaticCredentialsProvider;
 import com.amazonaws.regions.RegionUtils;
+import com.amazonaws.services.dynamodb.sessionmanager.converters.DefaultDynamoSessionItemConverter;
 import com.amazonaws.services.dynamodb.sessionmanager.converters.DefaultTomcatSessionConverter;
-import com.amazonaws.services.dynamodb.sessionmanager.converters.LegacyDynamoDBSessionItemConverter;
 import com.amazonaws.services.dynamodb.sessionmanager.converters.LegacyTomcatSessionConverter;
 import com.amazonaws.services.dynamodb.sessionmanager.converters.SessionConverter;
 import com.amazonaws.services.dynamodb.sessionmanager.converters.TomcatSessionConverterChain;
@@ -49,9 +49,9 @@ public class DynamoDBSessionManager extends PersistentManagerBase {
 
     public static final String DEFAULT_TABLE_NAME = "Tomcat_SessionState";
 
-    private static final String USER_AGENT = "DynamoSessionManager/1.1";
+    private static final String USER_AGENT = "DynamoSessionManager/2.0";
     private static final String name = "AmazonDynamoDBSessionManager";
-    private static final String info = name + "/1.1";
+    private static final String info = name + "/2.0";
 
     private String regionId = "us-east-1";
     private String endpoint;
@@ -87,10 +87,6 @@ public String getName() {
         return name;
     }
 
-    //
-    // Context.xml Configuration Members
-    //
-
     public void setRegionId(String regionId) {
         this.regionId = regionId;
     }
@@ -135,10 +131,6 @@ public void setProxyPort(Integer proxyPort) {
         this.proxyPort = proxyPort;
     }
 
-    //
-    // Private Interface
-    //
-
     @Override
     protected void initInternal() throws LifecycleException {
         this.setDistributable(true);
@@ -170,16 +162,16 @@ private AWSCredentialsProvider initCredentials() {
             if (credentialsInContextConfigAreValid()) {
                 throw new AmazonClientException("Incomplete AWS security credentials specified in context.xml.");
             }
-            debug("Using AWS access key ID and secret key from context.xml");
+            logger.debug("Using AWS access key ID and secret key from context.xml");
             return new StaticCredentialsProvider(new BasicAWSCredentials(accessKey, secretKey));
         }
 
         // Use any explicitly specified credentials properties file next
         if (credentialsFile != null) {
             try {
-                debug("Reading security credentials from properties file: " + credentialsFile);
+                logger.debug("Reading security credentials from properties file: " + credentialsFile);
                 PropertiesCredentials credentials = new PropertiesCredentials(credentialsFile);
-                debug("Using AWS credentials from file: " + credentialsFile);
+                logger.debug("Using AWS credentials from file: " + credentialsFile);
                 return new StaticCredentialsProvider(credentials);
             } catch (Exception e) {
                 throw new AmazonClientException(
@@ -191,13 +183,13 @@ private AWSCredentialsProvider initCredentials() {
         // Fall back to the default credentials chain provider if credentials weren't explicitly set
         AWSCredentialsProvider defaultChainProvider = new DefaultAWSCredentialsProviderChain();
         if (defaultChainProvider.getCredentials() == null) {
-            debug("Loading security credentials from default credentials provider chain.");
+            logger.debug("Loading security credentials from default credentials provider chain.");
             throw new AmazonClientException(
                     "Unable find AWS security credentials.  "
                             + "Searched JVM system properties, OS env vars, and EC2 instance roles.  "
                             + "Specify credentials in Tomcat's context.xml file or put them in one of the places mentioned above.");
         }
-        debug("Using default AWS credentials provider chain to load credentials");
+        logger.debug("Using default AWS credentials provider chain to load credentials");
         return defaultChainProvider;
     }
 
@@ -223,12 +215,12 @@ private ClientConfiguration initClientConfiguration() {
 
         // Attempt to use an explicit proxy configuration
         if (proxyHost != null || proxyPort != null) {
-            debug("Reading proxy settings from context.xml");
+            logger.debug("Reading proxy settings from context.xml");
             if (proxyHost == null || proxyPort == null) {
                 throw new AmazonClientException("Incomplete proxy settings specified in context.xml."
                         + " Both proxy hot and proxy port needs to be specified");
             }
-            debug("Using proxy host and port from context.xml");
+            logger.debug("Using proxy host and port from context.xml");
             clientConfiguration.withProxyHost(proxyHost).withProxyPort(proxyPort);
         }
 
@@ -260,9 +252,9 @@ private SessionConverter getSessionConverter() {
         LegacyTomcatSessionConverter legacyConverter = new LegacyTomcatSessionConverter(this, classLoader,
                 maxInactiveInterval);
         DefaultTomcatSessionConverter defaultConverter = new DefaultTomcatSessionConverter(this, classLoader);
-        // Converter compatible with the legacy schema but can understand new schema
-        return new SessionConverter(TomcatSessionConverterChain.wrap(legacyConverter, defaultConverter),
-                new LegacyDynamoDBSessionItemConverter());
+        // Converter that 'writes' with the new schema but can still read the legacy schema
+        return new SessionConverter(TomcatSessionConverterChain.wrap(defaultConverter, legacyConverter),
+                new DefaultDynamoSessionItemConverter());
     }
 
     /**
@@ -283,28 +275,4 @@ private Context getAssociatedContext() {
             throw new IllegalStateException(e);
         }
     }
-
-    //
-    // Logger Utility Functions
-    //
-
-    public static void debug(String s) {
-        logger.debug(s);
-    }
-
-    public static void warn(String s) {
-        logger.warn(s);
-    }
-
-    public static void warn(String s, Exception e) {
-        logger.warn(s, e);
-    }
-
-    public static void error(String s) {
-        logger.error(s);
-    }
-
-    public static void error(String s, Exception e) {
-        logger.error(s, e);
-    }
 }

src/main/java/com/amazonaws/services/dynamodb/sessionmanager/util/ValidatorUtils.java

@@ -1,3 +1,17 @@
+/*
+ * Copyright 2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
 package com.amazonaws.services.dynamodb.sessionmanager.util;
 
 public class ValidatorUtils {