You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by mr...@apache.org on 2016/01/31 18:56:14 UTC
usergrid git commit: USERGRID-683 - use only the AWS sdks required
and re-format the pom files in the process.
Repository: usergrid
Updated Branches:
refs/heads/master 3d7a8f1c1 -> 1fcbcf4e6
USERGRID-683 - use only the AWS sdks required and re-format the pom files in the process.
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/1fcbcf4e
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/1fcbcf4e
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/1fcbcf4e
Branch: refs/heads/master
Commit: 1fcbcf4e60e148295e6388849d4689e3e95ade43
Parents: 3d7a8f1
Author: Michael Russo <mi...@gmail.com>
Authored: Sun Jan 31 09:55:28 2016 -0800
Committer: Michael Russo <mi...@gmail.com>
Committed: Sun Jan 31 09:55:28 2016 -0800
----------------------------------------------------------------------
.../rx/impl/AllApplicationsObservable.java | 2 -
stack/corepersistence/common/pom.xml | 2 +-
.../astyanax/MultiKeyColumnNameIterator.java | 4 +-
stack/corepersistence/pom.xml | 112 ++++++------
stack/corepersistence/queue/pom.xml | 179 ++++++++++---------
stack/pom.xml | 7 +-
.../applications/assets/AwsAssetResourceIT.java | 1 -
stack/services/pom.xml | 13 +-
.../management/export/S3ExportImpl.java | 1 -
.../management/importer/S3ImportImpl.java | 2 -
.../assets/data/AwsSdkS3BinaryStore.java | 7 -
.../usergrid/management/importer/S3Upload.java | 1 -
12 files changed, 158 insertions(+), 173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservable.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservable.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservable.java
index 76ad8a1..f7c5f45 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservable.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/rx/impl/AllApplicationsObservable.java
@@ -23,8 +23,6 @@ package org.apache.usergrid.corepersistence.rx.impl;
import org.apache.usergrid.persistence.core.migration.data.MigrationDataProvider;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
-import com.amazonaws.services.opsworks.model.App;
-
import rx.Observable;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/corepersistence/common/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml
index ff2ab28..b47706c 100644
--- a/stack/corepersistence/common/pom.xml
+++ b/stack/corepersistence/common/pom.xml
@@ -153,7 +153,7 @@
<!-- aws sdks -->
<dependency>
<groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
+ <artifactId>aws-java-sdk-core</artifactId>
<version>${aws.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
index 8c12a25..f7bd02e 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiKeyColumnNameIterator.java
@@ -33,8 +33,6 @@ import org.slf4j.LoggerFactory;
import org.apache.usergrid.persistence.core.rx.OrderedMerge;
-import com.amazonaws.services.redshift.model.UnsupportedOptionException;
-
import rx.Observable;
import rx.Subscriber;
import rx.schedulers.Schedulers;
@@ -197,7 +195,7 @@ public class MultiKeyColumnNameIterator<C, T> implements Iterable<T>, Iterator<T
@Override
public void remove() {
- throw new UnsupportedOptionException( "Remove is unsupported" );
+ throw new UnsupportedOperationException( "Remove is unsupported" );
}
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index 7737eac..0d8609b 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -28,40 +28,43 @@ limitations under the License.
<packaging>pom</packaging>
<version>2.1.1-SNAPSHOT</version>
- <profiles>
-
- <!-- better to have keep this sonar profile in your maven settings.xml -->
- <profile>
- <id>sonar</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <properties>
- <sonar.host.url>http://localhost:9000</sonar.host.url>
- <sonar.jdbc.url>jdbc:h2:tcp://localhost:9092/sonar</sonar.jdbc.url>
- <sonar.jdbc.username>sonar</sonar.jdbc.username>
- <sonar.jdbc.password>sonar</sonar.jdbc.password>
- </properties>
- </profile>
-
- <profile>
- <id>jacoco</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
- <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
+ <profiles>
+
+ <!-- better to have keep this sonar profile in your maven settings.xml -->
+ <profile>
+ <id>sonar</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <properties>
+ <sonar.host.url>http://localhost:9000</sonar.host.url>
+ <sonar.jdbc.url>jdbc:h2:tcp://localhost:9092/sonar</sonar.jdbc.url>
+ <sonar.jdbc.username>sonar</sonar.jdbc.username>
+ <sonar.jdbc.password>sonar</sonar.jdbc.password>
+ </properties>
+ </profile>
+
+ <profile>
+ <id>jacoco</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <argLine>
+ -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec
+ </argLine>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest
+ </excludedGroups>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
<properties>
@@ -72,7 +75,7 @@ limitations under the License.
<archaius.version>0.5.12</archaius.version>
<astyanax.version>3.9.0</astyanax.version>
<cassandra.version>1.2.18</cassandra.version>
-<!-- <chop.version>1.0</chop.version>-->
+ <!-- <chop.version>1.0</chop.version>-->
<commons.codec.version>1.6</commons.codec.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.io.version>2.4</commons.io.version>
@@ -91,10 +94,10 @@ limitations under the License.
<rx.version>1.0.14</rx.version>
<slf4j.version>1.7.2</slf4j.version>
<surefire.version>2.16</surefire.version>
- <aws.version>1.10.6</aws.version>
<metrics.version>3.0.0</metrics.version>
<surefire.plugin.version>2.18.1</surefire.plugin.version>
<jacoco.version>0.7.5.201505241946</jacoco.version>
+ <aws.version>1.10.20</aws.version>
</properties>
@@ -127,7 +130,8 @@ limitations under the License.
<archaius.deployment.environment>UNIT</archaius.deployment.environment>
</systemPropertyVariables>
<argLine>-Xms2G -Xmx4G</argLine>
- <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest</excludedGroups>
+ <excludedGroups>org.apache.usergrid.StressTest,org.apache.usergrid.ExperimentalTest
+ </excludedGroups>
</configuration>
</plugin>
@@ -216,23 +220,23 @@ limitations under the License.
</plugins>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.properties</include>
- </includes>
- </resource>
- <!-- include everything else without filtering -->
- <resource>
- <directory>src/main/resources</directory>
- <filtering>false</filtering>
- <includes>
- <include>**</include>
- </includes>
- </resource>
- </resources>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*.properties</include>
+ </includes>
+ </resource>
+ <!-- include everything else without filtering -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**</include>
+ </includes>
+ </resource>
+ </resources>
<testResources>
<testResource>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/corepersistence/queue/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/pom.xml b/stack/corepersistence/queue/pom.xml
index 9f8ac97..f026454 100644
--- a/stack/corepersistence/queue/pom.xml
+++ b/stack/corepersistence/queue/pom.xml
@@ -21,94 +21,95 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>persistence</artifactId>
- <groupId>org.apache.usergrid</groupId>
- <version>2.1.1-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>queue</artifactId>
-
- <name>Usergrid Queue</name>
-
- <dependencies>
-
-
- <dependency>
- <groupId>org.apache.usergrid</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
-
-
- <!-- lang utils for setting uuids etc -->
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons.lang.version}</version>
- </dependency>
-
- <!-- tests -->
-
- <dependency>
- <groupId>org.apache.usergrid</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.8.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.usergrid</groupId>
- <artifactId>collection</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk</artifactId>
- <version>${aws.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.2</version>
- </dependency>
-
-
- </dependencies>
-
-<!--
- <profiles>
- <profile>
- <id>jacoco</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.plugin.version}</version>
- <configuration>
- <argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
--->
+ <parent>
+ <artifactId>persistence</artifactId>
+ <groupId>org.apache.usergrid</groupId>
+ <version>2.1.1-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>queue</artifactId>
+ <name>Usergrid Queue</name>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+
+ <!-- lang utils for setting uuids etc -->
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>${commons.lang.version}</version>
+ </dependency>
+
+ <!-- tests -->
+
+ <dependency>
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>common</artifactId>
+ <version>${project.version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.8.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.usergrid</groupId>
+ <artifactId>collection</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-sns</artifactId>
+ <version>${aws.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-sqs</artifactId>
+ <version>${aws.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.2</version>
+ </dependency>
+
+ </dependencies>
+
+ <!--
+ <profiles>
+ <profile>
+ <id>jacoco</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire.plugin.version}</version>
+ <configuration>
+ <argLine>-javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec</argLine>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+ -->
</project>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index e26693a..0a81a05 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -287,11 +287,6 @@
</exclusions>
</dependency>
- <dependency>
- <groupId>com.amazonaws</groupId>
- <artifactId>aws-java-sdk-s3</artifactId>
- <version>${aws.version}</version>
- </dependency>
<dependency>
@@ -1566,7 +1561,7 @@
</build>
</profile>
</profiles>
-
+
<scm>
<url>https://git-wip-us.apache.org/repos/asf/usergrid.git</url>
<connection>scm:git:http://git-wip-us.apache.org/repos/asf/usergrid.git</connection>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
index 2a8b00d..ad12975 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/applications/assets/AwsAssetResourceIT.java
@@ -18,7 +18,6 @@ package org.apache.usergrid.rest.applications.assets;
import com.amazonaws.SDKGlobalConfiguration;
-import com.amazonaws.services.cognitoidentity.model.InternalErrorException;
import net.jcip.annotations.NotThreadSafe;
import org.apache.commons.io.IOUtils;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index 84a2da1..1127198 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -255,13 +255,14 @@
<dependency>
<groupId>com.amazonaws</groupId>
+ <artifactId>aws-java-sdk-core</artifactId>
+ <version>${aws.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
- <!--<exclusions>-->
- <!--<exclusion>-->
- <!--<artifactId>jackson-databind</artifactId>-->
- <!--<groupId>com.fasterxml.jackson.core</groupId>-->
- <!--</exclusion>-->
- <!--</exclusions>-->
+ <version>${aws.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
index f8005d1..81a9730 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/S3ExportImpl.java
@@ -17,7 +17,6 @@
package org.apache.usergrid.management.export;
-import com.amazonaws.SDKGlobalConfiguration;
import com.google.common.collect.ImmutableSet;
import com.google.common.hash.Hashing;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
index f44902f..638f7de 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/importer/S3ImportImpl.java
@@ -17,12 +17,10 @@
package org.apache.usergrid.management.importer;
-import com.amazonaws.SDKGlobalConfiguration;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.RandomStringUtils;
-import org.apache.lucene.document.StringField;
import org.jclouds.ContextBuilder;
import org.jclouds.blobstore.BlobStore;
import org.jclouds.blobstore.BlobStoreContext;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
index 47a99c0..e29de5c 100644
--- a/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
+++ b/stack/services/src/main/java/org/apache/usergrid/services/assets/data/AwsSdkS3BinaryStore.java
@@ -21,7 +21,6 @@ import java.io.BufferedOutputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Iterator;
@@ -35,7 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.apache.usergrid.persistence.Entity;
import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.EntityManagerFactory;
-import org.apache.usergrid.persistence.exceptions.RequiredPropertyNotFoundException;
import org.apache.usergrid.persistence.queue.impl.UsergridAwsCredentialsProvider;
import org.apache.usergrid.services.exceptions.AwsPropertiesNotFoundException;
import org.apache.usergrid.utils.StringUtils;
@@ -44,16 +42,11 @@ import org.apache.commons.codec.binary.Hex;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
-import com.amazonaws.AmazonClientException;
-import com.amazonaws.AmazonServiceException;
import com.amazonaws.ClientConfiguration;
import com.amazonaws.Protocol;
-import com.amazonaws.SDKGlobalConfiguration;
import com.amazonaws.auth.AWSCredentials;
-import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.regions.Region;
import com.amazonaws.regions.Regions;
-import com.amazonaws.services.glacier.model.ListMultipartUploadsResult;
import com.amazonaws.services.s3.AmazonS3;
import com.amazonaws.services.s3.AmazonS3Client;
import com.amazonaws.services.s3.model.AbortMultipartUploadRequest;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/1fcbcf4e/stack/services/src/test/java/org/apache/usergrid/management/importer/S3Upload.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/importer/S3Upload.java b/stack/services/src/test/java/org/apache/usergrid/management/importer/S3Upload.java
index e76c90a..ca24407 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/importer/S3Upload.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/importer/S3Upload.java
@@ -40,7 +40,6 @@ import org.jclouds.netty.config.NettyPayloadModule;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.amazonaws.SDKGlobalConfiguration;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Module;