+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License 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 org.jclouds.aws.util;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
+import java.util.SimpleTimeZone;
+
+import net.jcip.annotations.GuardedBy;
+import net.jcip.annotations.ThreadSafe;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import com.google.common.annotations.VisibleForTesting;
+
+/**
+ * Parses and formats the ISO8601 and RFC822 date formats found in XML responses and HTTP response
+ * headers.
+ *
+ * Either {@link SimpleDateFormat} or {@link DateTimeFormatter} classes are used internally,
+ * depending on which version gives the best performance.
+ *
+ * @author Adrian Cole
+ * @author James Murty
+ */
+@ThreadSafe
+public class DateService {
+ /*
+ * Use default Java Date/SimpleDateFormat classes for date manipulation, but be *very* careful to
+ * guard against the lack of thread safety.
+ */
+
+ @GuardedBy("this")
+ private static final SimpleDateFormat iso8601SimpleDateFormat = new SimpleDateFormat(
+ "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", Locale.US);
+
+ @GuardedBy("this")
+ private static final SimpleDateFormat rfc822SimpleDateFormat = new SimpleDateFormat(
+ "EEE, dd MMM yyyy HH:mm:ss z", Locale.US);
+
+ private static final DateTimeFormatter iso8601DateTimeFormatter = DateTimeFormat.forPattern(
+ "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'").withLocale(Locale.US).withZone(
+ DateTimeZone.forID("GMT"));
+
+ private static final DateTimeFormatter rfc822DateTimeFormatter = DateTimeFormat.forPattern(
+ "EEE, dd MMM yyyy HH:mm:ss 'GMT'").withLocale(Locale.US).withZone(
+ DateTimeZone.forID("GMT"));
+
+ static {
+ iso8601SimpleDateFormat.setTimeZone(new SimpleTimeZone(0, "GMT"));
+ rfc822SimpleDateFormat.setTimeZone(new SimpleTimeZone(0, "GMT"));
+ }
+
+ public final String rfc822DateFormat(DateTime dateTime) {
+ return rfc822DateTimeFormatter.print(dateTime);
+ }
+
+ public final String rfc822DateFormat(Date date) {
+ return rfc822DateFormat(new DateTime(date));
+ }
+
+ public final String rfc822DateFormat() {
+ return rfc822DateFormat(new DateTime());
+ }
+
+ public final DateTime rfc822DateParse(String toParse) {
+ synchronized (rfc822SimpleDateFormat) {
+ try {
+ return new DateTime(rfc822SimpleDateFormat.parse(toParse));
+ } catch (ParseException e) {
+ return null;
+ }
+ }
+ }
+
+ public final String iso8601DateFormat(DateTime dateTime) {
+ return iso8601DateTimeFormatter.print(dateTime);
+ }
+
+ public final String iso8601DateFormat(Date date) {
+ return iso8601DateFormat(new DateTime(date));
+ }
+
+ public final String iso8601DateFormat() {
+ return iso8601DateFormat(new DateTime());
+ }
+
+ public final DateTime iso8601DateParse(String toParse) {
+ synchronized (iso8601SimpleDateFormat) {
+ try {
+ return new DateTime(iso8601SimpleDateFormat.parse(toParse));
+ } catch (ParseException e) {
+ return null;
+ }
+ }
+ }
+
+ /*
+ * Alternative implementations of Format and Parse -- used to test relative speeds. TODO: Remove
+ * methods below once sufficient performance testing is complete.
+ */
+
+ @VisibleForTesting
+ public final DateTime jodaIso8601DateParse(String toParse) {
+ return new DateTime(toParse);
+ }
+
+ @VisibleForTesting
+ public final String sdfIso8601DateFormat(DateTime dateTime) {
+ synchronized (iso8601SimpleDateFormat) {
+ return iso8601SimpleDateFormat.format(dateTime.toDate());
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/PerformanceTest.java b/aws/core/src/test/java/org/jclouds/aws/PerformanceTest.java
similarity index 66%
rename from aws/s3/core/src/test/java/org/jclouds/aws/PerformanceTest.java
rename to aws/core/src/test/java/org/jclouds/aws/PerformanceTest.java
index 17a09f6fa3..2d81e01d04 100644
--- a/aws/s3/core/src/test/java/org/jclouds/aws/PerformanceTest.java
+++ b/aws/core/src/test/java/org/jclouds/aws/PerformanceTest.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import org.jclouds.aws.util.DateServiceTest;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
@@ -57,20 +58,17 @@ public class PerformanceTest {
exec.shutdownNow();
exec = null;
}
-
+
/**
- * Executes a list of Runnable tasks in {@link #THREAD_COUNT}
- * simultaneous threads, and outputs the timing results.
+ * Executes a list of Runnable tasks in {@link #THREAD_COUNT} simultaneous threads, and outputs
+ * the timing results.
*
- * This method is careful to time only the actual task execution
- * time, not the overhead of creating and queuing the tasks.
- * We also use CountDownLatches to ensure that all tasks start
- * at the same time, so concurrency is fully tested without
- * ramp-up or ramp-down times.
+ * This method is careful to time only the actual task execution time, not the overhead of
+ * creating and queuing the tasks. We also use CountDownLatches to ensure that all tasks start at
+ * the same time, so concurrency is fully tested without ramp-up or ramp-down times.
*
- * This code is heavily based on Listing 5.11 in
- * "Java Concurrency in Practice" by Brian Goetz et al,
- * Addison-Wesley Professional.
+ * This code is heavily based on Listing 5.11 in "Java Concurrency in Practice" by Brian Goetz et
+ * al, Addison-Wesley Professional.
*
* @see {@link DateServiceTest} for example usage.
*
@@ -80,55 +78,53 @@ public class PerformanceTest {
* @throws ExecutionException
* @throws Throwable
*/
- protected void executeMultiThreadedPerformanceTest(String performanceTestName, List tasks)
- throws InterruptedException, ExecutionException, Throwable
- {
+ protected void executeMultiThreadedPerformanceTest(String performanceTestName,
+ List tasks) throws InterruptedException, ExecutionException, Throwable {
CompletionService completer = new ExecutorCompletionService(exec);
final CountDownLatch startGate = new CountDownLatch(1);
final CountDownLatch endGate = new CountDownLatch(THREAD_COUNT);
-
+
for (int i = 0; i < THREAD_COUNT; i++) {
- final Runnable task = tasks.get(i % tasks.size());
- // Wrap task so we can count down endGate.
+ final Runnable task = tasks.get(i % tasks.size());
+ // Wrap task so we can count down endGate.
completer.submit(new Callable() {
- public Throwable call() {
- try {
- startGate.await(); // Wait to start simultaneously
- task.run();
- return null;
- } catch (Throwable t) {
- return t;
- } finally {
- endGate.countDown(); // Notify that I've finished
- }
- }
- });
- }
-
+ public Throwable call() {
+ try {
+ startGate.await(); // Wait to start simultaneously
+ task.run();
+ return null;
+ } catch (Throwable t) {
+ return t;
+ } finally {
+ endGate.countDown(); // Notify that I've finished
+ }
+ }
+ });
+ }
+
// Only time the execution time for all tasks, not start/stop times.
long startTime = System.nanoTime();
- startGate.countDown(); // Trigger start of all tasks
+ startGate.countDown(); // Trigger start of all tasks
endGate.await();
long endTime = System.nanoTime() - startTime;
// Check for assertion failures
- Throwable t;
+ Throwable t;
for (int i = 0; i < THREAD_COUNT; i++) {
- t = completer.take().get();
- if (t != null) {
- throw t;
- }
- }
+ t = completer.take().get();
+ if (t != null) {
+ throw t;
+ }
+ }
if (performanceTestName != null) {
- System.out.printf("TIMING: Multi-threaded %s took %.3fms for %d threads\n",
- performanceTestName, ((double)endTime / 1000000), THREAD_COUNT);
+ System.out.printf("TIMING: Multi-threaded %s took %.3fms for %d threads\n",
+ performanceTestName, ((double) endTime / 1000000), THREAD_COUNT);
}
}
- protected void executeMultiThreadedCorrectnessTest(List tasks)
- throws InterruptedException, ExecutionException, Throwable
- {
- executeMultiThreadedPerformanceTest(null, tasks);
+ protected void executeMultiThreadedCorrectnessTest(List tasks)
+ throws InterruptedException, ExecutionException, Throwable {
+ executeMultiThreadedPerformanceTest(null, tasks);
}
-}
+}
\ No newline at end of file
diff --git a/aws/core/src/test/java/org/jclouds/aws/util/DateServiceTest.java b/aws/core/src/test/java/org/jclouds/aws/util/DateServiceTest.java
new file mode 100644
index 0000000000..31958100c8
--- /dev/null
+++ b/aws/core/src/test/java/org/jclouds/aws/util/DateServiceTest.java
@@ -0,0 +1,216 @@
+/**
+ *
+ * Copyright (C) 2009 Adrian Cole
+ *
+ * ====================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License 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 org.jclouds.aws.util;
+
+import static org.testng.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+import org.jclouds.aws.PerformanceTest;
+import org.joda.time.DateTime;
+import org.testng.annotations.Test;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+/*
+ * TODO: Scrap any non-DateService references (eg Joda & Amazon) if/when
+ * we confirm that the DateService is fast enough.
+ */
+
+/**
+ * Compares performance of date operations
+ *
+ * @author Adrian Cole
+ * @author James Murty
+ */
+@Test(sequential = true, timeOut = 2 * 60 * 1000, testName = "s3.DateTest")
+public class DateServiceTest extends PerformanceTest {
+ Injector i = Guice.createInjector();
+
+ DateService dateService = i.getInstance(DateService.class);
+
+ protected TestData[] testData;
+
+ protected class TestData {
+ public final String iso8601DateString;
+ public final String rfc822DateString;
+ public final DateTime date;
+
+ TestData(String iso8601, String rfc822, DateTime dateTime) {
+ this.iso8601DateString = iso8601;
+ this.rfc822DateString = rfc822;
+ this.date = dateTime;
+ }
+ }
+
+ public DateServiceTest() {
+ // Constant time test values, each TestData item must contain matching times!
+ testData = new TestData[] {
+ new TestData("2009-03-12T02:00:07.000Z", "Thu, 12 Mar 2009 02:00:07 GMT",
+ new DateTime(1236823207000l)),
+ new TestData("2009-03-14T04:00:07.000Z", "Sat, 14 Mar 2009 04:00:07 GMT",
+ new DateTime(1237003207000l)),
+ new TestData("2009-03-16T06:00:07.000Z", "Mon, 16 Mar 2009 06:00:07 GMT",
+ new DateTime(1237183207000l)),
+ new TestData("2009-03-18T08:00:07.000Z", "Wed, 18 Mar 2009 08:00:07 GMT",
+ new DateTime(1237363207000l)),
+ new TestData("2009-03-20T10:00:07.000Z", "Fri, 20 Mar 2009 10:00:07 GMT",
+ new DateTime(1237543207000l)) };
+ }
+
+ @Test
+ public void testIso8601DateParse() throws ExecutionException, InterruptedException {
+ DateTime dsDate = dateService.iso8601DateParse(testData[0].iso8601DateString);
+ assertEquals(dsDate, testData[0].date);
+ }
+
+ @Test
+ public void testRfc822DateParse() throws ExecutionException, InterruptedException {
+ DateTime dsDate = dateService.rfc822DateParse(testData[0].rfc822DateString);
+ assertEquals(dsDate, testData[0].date);
+ }
+
+ @Test
+ public void testIso8601DateFormat() throws ExecutionException, InterruptedException {
+ String dsString = dateService.iso8601DateFormat(testData[0].date);
+ assertEquals(dsString, testData[0].iso8601DateString);
+ }
+
+ @Test
+ public void testRfc822DateFormat() throws ExecutionException, InterruptedException {
+ String dsString = dateService.rfc822DateFormat(testData[0].date);
+ assertEquals(dsString, testData[0].rfc822DateString);
+ }
+
+ @Test
+ void testIso8601DateFormatResponseTime() throws ExecutionException, InterruptedException {
+ for (int i = 0; i < LOOP_COUNT; i++)
+ dateService.iso8601DateFormat();
+ }
+
+ @Test
+ void testRfc822DateFormatResponseTime() throws ExecutionException, InterruptedException {
+ for (int i = 0; i < LOOP_COUNT; i++)
+ dateService.rfc822DateFormat();
+ }
+
+ @Test
+ void testFormatIso8601DateCorrectnessInParallel() throws Throwable {
+ List tasks = new ArrayList(testData.length);
+ for (final TestData myData : testData) {
+ tasks.add(new Runnable() {
+ public void run() {
+ String dsString = dateService.iso8601DateFormat(myData.date);
+ assertEquals(dsString, myData.iso8601DateString);
+ }
+ });
+ }
+ executeMultiThreadedCorrectnessTest(tasks);
+ }
+
+ @Test
+ void testFormatIso8601DatePerformanceInParallel() throws Throwable {
+ List tasks = new ArrayList(testData.length);
+ for (final TestData myData : testData) {
+ tasks.add(new Runnable() {
+ public void run() {
+ dateService.iso8601DateFormat(myData.date);
+ }
+ });
+ }
+ executeMultiThreadedPerformanceTest("testFormatIso8601DatePerformanceInParallel", tasks);
+ }
+
+ @Test
+ void testFormatIso8601DatePerformanceInParallel_SdfAlternative() throws Throwable {
+ List tasks = new ArrayList(testData.length);
+ for (final TestData myData : testData) {
+ tasks.add(new Runnable() {
+ public void run() {
+ dateService.sdfIso8601DateFormat(myData.date);
+ }
+ });
+ }
+ executeMultiThreadedPerformanceTest(
+ "testFormatIso8601DatePerformanceInParallel_SdfAlternative", tasks);
+ }
+
+ @Test
+ void testParseIso8601DateSerialResponseTime() throws ExecutionException, InterruptedException {
+ for (int i = 0; i < LOOP_COUNT; i++)
+ dateService.iso8601DateParse(testData[0].iso8601DateString);
+ }
+
+ @Test
+ void testParseIso8601DateSerialResponseTime_JodaAlternative() throws ExecutionException,
+ InterruptedException {
+ for (int i = 0; i < LOOP_COUNT; i++)
+ dateService.jodaIso8601DateParse(testData[0].iso8601DateString);
+ }
+
+ @Test
+ void testParseIso8601DateCorrectnessInParallel() throws Throwable {
+ List tasks = new ArrayList(testData.length);
+ for (final TestData myData : testData) {
+ tasks.add(new Runnable() {
+ public void run() {
+ DateTime dsDate = dateService.iso8601DateParse(myData.iso8601DateString);
+ assertEquals(dsDate, myData.date);
+ }
+ });
+ }
+ executeMultiThreadedCorrectnessTest(tasks);
+ }
+
+ @Test
+ void testParseIso8601DatePerformanceInParallel() throws Throwable {
+ List tasks = new ArrayList(testData.length);
+ for (final TestData myData : testData) {
+ tasks.add(new Runnable() {
+ public void run() {
+ dateService.iso8601DateParse(myData.iso8601DateString);
+ }
+ });
+ }
+ executeMultiThreadedPerformanceTest("testParseIso8601DatePerformanceInParallel", tasks);
+ }
+
+ @Test
+ void testParseIso8601DatePerformanceInParallel_JodaAlternative() throws Throwable {
+ List tasks = new ArrayList(testData.length);
+ for (final TestData myData : testData) {
+ tasks.add(new Runnable() {
+ public void run() {
+ dateService.jodaIso8601DateParse(myData.iso8601DateString);
+ }
+ });
+ }
+ executeMultiThreadedPerformanceTest(
+ "testParseIso8601DatePerformanceInParallel_JodaAlternative", tasks);
+ }
+
+}
\ No newline at end of file
diff --git a/aws/pom.xml b/aws/pom.xml
index b8344836d2..116da38d10 100644
--- a/aws/pom.xml
+++ b/aws/pom.xml
@@ -38,6 +38,7 @@
pom
jclouds aws project
+ core
s3
@@ -57,7 +58,6 @@
test-jar
test
-
diff --git a/aws/s3/core/pom.xml b/aws/s3/core/pom.xml
index 302a380ba5..f15b31efdf 100644
--- a/aws/s3/core/pom.xml
+++ b/aws/s3/core/pom.xml
@@ -1,75 +1,56 @@
-
+ http://www.apache.org/licenses/LICENSE-2.0.html Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License 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.
+ ====================================================================
+ -->
-
- org.jclouds
- jclouds-s3-project
- 1.0-SNAPSHOT
- ../pom.xml
-
- 4.0.0
- org.jclouds
- jclouds-s3
- jclouds Amazon S3 Components Core
- jar
- jclouds Core components to access Amazon S3
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ org.jclouds
+ jclouds-s3-project
+ 1.0-SNAPSHOT
+ ../pom.xml
+
+ 4.0.0
+ org.jclouds
+ jclouds-s3
+ jclouds Amazon S3 Components Core
+ jar
+ jclouds Core components to access Amazon S3
-
- scm:svn:http://jclouds.googlecode.com/svn/trunk/s3
- scm:svn:https://jclouds.googlecode.com/svn/trunk/s3
- http://jclouds.googlecode.com/svn/trunk/s3
-
+
+ scm:svn:http://jclouds.googlecode.com/svn/trunk/s3
+ scm:svn:https://jclouds.googlecode.com/svn/trunk/s3
+ http://jclouds.googlecode.com/svn/trunk/s3
+
-
-
-
- http://apache.rediris.es/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
+
+ http://apache.rediris.es/maven/binaries/apache-maven-2.1.0-bin.tar.bz2
- 9268c9de2cccfd0d8fbcdbcfaf517a87
-
-
-
-
- joda-time
- joda-time
- 1.6
-
-
- bouncycastle
- bcprov-jdk15
- 140
-
-
- xstream
- xstream
- 1.2
- test
-
-
+ 9268c9de2cccfd0d8fbcdbcfaf517a87
+
+
+
+ xstream
+ xstream
+ 1.2
+ test
+
+
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextFactory.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextFactory.java
index 12ca56047f..4c0c0787b3 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextFactory.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/S3ContextFactory.java
@@ -23,8 +23,30 @@
*/
package org.jclouds.aws.s3;
-import com.google.common.annotations.VisibleForTesting;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.jclouds.aws.s3.reference.S3Constants.PROPERTY_AWS_ACCESSKEYID;
+import static org.jclouds.aws.s3.reference.S3Constants.PROPERTY_AWS_SECRETACCESSKEY;
+import static org.jclouds.command.pool.PoolConstants.PROPERTY_POOL_IO_WORKER_THREADS;
+import static org.jclouds.command.pool.PoolConstants.PROPERTY_POOL_MAX_CONNECTIONS;
+import static org.jclouds.command.pool.PoolConstants.PROPERTY_POOL_MAX_CONNECTION_REUSE;
+import static org.jclouds.command.pool.PoolConstants.PROPERTY_POOL_MAX_SESSION_FAILURES;
+import static org.jclouds.command.pool.PoolConstants.PROPERTY_POOL_REQUEST_INVOKER_THREADS;
+import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_ADDRESS;
+import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_PORT;
+import static org.jclouds.http.HttpConstants.PROPERTY_HTTP_SECURE;
+
+import java.util.List;
+import java.util.Properties;
+
+import org.jclouds.aws.s3.config.LiveS3ConnectionModule;
+import org.jclouds.aws.s3.config.S3ConnectionModule;
+import org.jclouds.aws.s3.config.S3ContextModule;
+import org.jclouds.http.config.HttpFutureCommandClientModule;
+import org.jclouds.http.config.JavaUrlHttpFutureCommandClientModule;
+import org.jclouds.logging.config.LoggingModule;
+import org.jclouds.logging.jdk.config.JDKLoggingModule;
+
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterables;
@@ -34,203 +56,165 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.name.Names;
-import org.jclouds.aws.s3.config.LiveS3ConnectionModule;
-import org.jclouds.aws.s3.config.S3ConnectionModule;
-import org.jclouds.aws.s3.config.S3ContextModule;
-import static org.jclouds.aws.s3.reference.S3Constants.PROPERTY_AWS_ACCESSKEYID;
-import static org.jclouds.aws.s3.reference.S3Constants.PROPERTY_AWS_SECRETACCESSKEY;
-import org.jclouds.aws.s3.internal.LiveS3Connection;
-import static org.jclouds.command.pool.PoolConstants.*;
-import static org.jclouds.http.HttpConstants.*;
-import org.jclouds.http.config.HttpFutureCommandClientModule;
-import org.jclouds.http.config.JavaUrlHttpFutureCommandClientModule;
-import org.jclouds.logging.config.LoggingModule;
-import org.jclouds.logging.jdk.config.JDKLoggingModule;
-
-import java.util.List;
-import java.util.Properties;
/**
- * Creates {@link S3Context} or {@link Injector} instances based on the most
- * commonly requested arguments.
+ * Creates {@link S3Context} or {@link Injector} instances based on the most commonly requested
+ * arguments.
*
- * Note that Threadsafe objects will be bound as singletons to the Injector or
- * Context provided.
+ * Note that Threadsafe objects will be bound as singletons to the Injector or Context provided.
*
*
- * If no Modules are specified, the default
- * {@link JDKLoggingModule logging} and
- * {@link JavaUrlHttpFutureCommandClientModule http transports} will be
- * installed.
- *
+ * If no Modules are specified, the default {@link JDKLoggingModule logging} and
+ * {@link JavaUrlHttpFutureCommandClientModule http transports} will be installed.
+ *
* @author Adrian Cole
* @see S3Context
*/
public class S3ContextFactory {
- public static final Properties DEFAULT_PROPERTIES;
+ public static final Properties DEFAULT_PROPERTIES;
- static {
- DEFAULT_PROPERTIES = new Properties();
- DEFAULT_PROPERTIES.setProperty(PROPERTY_HTTP_ADDRESS,
- "s3.amazonaws.com");
- DEFAULT_PROPERTIES.setProperty(PROPERTY_HTTP_PORT, "443");
- DEFAULT_PROPERTIES.setProperty(PROPERTY_HTTP_SECURE, "true");
- DEFAULT_PROPERTIES
- .setProperty(PROPERTY_POOL_MAX_CONNECTION_REUSE, "75");
- DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_MAX_SESSION_FAILURES, "2");
- DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_REQUEST_INVOKER_THREADS,
- "1");
- DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_IO_WORKER_THREADS, "2");
- DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_MAX_CONNECTIONS, "12");
- }
+ static {
+ DEFAULT_PROPERTIES = new Properties();
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_HTTP_ADDRESS, "s3.amazonaws.com");
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_HTTP_PORT, "443");
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_HTTP_SECURE, "true");
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_MAX_CONNECTION_REUSE, "75");
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_MAX_SESSION_FAILURES, "2");
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_REQUEST_INVOKER_THREADS, "1");
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_IO_WORKER_THREADS, "2");
+ DEFAULT_PROPERTIES.setProperty(PROPERTY_POOL_MAX_CONNECTIONS, "12");
+ }
- public static Injector createInjector(String awsAccessKeyId,
- String awsSecretAccessKey, Module... modules) {
- Properties properties = new Properties(DEFAULT_PROPERTIES);
- properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
- properties
- .setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
- return createInjector(properties, modules);
- }
+ public static Injector createInjector(String awsAccessKeyId, String awsSecretAccessKey,
+ Module... modules) {
+ Properties properties = new Properties(DEFAULT_PROPERTIES);
+ properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
+ properties.setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
+ return createInjector(properties, modules);
+ }
- public static S3Context createS3Context(String awsAccessKeyId,
- String awsSecretAccessKey, Module... modules) {
- return createInjector(awsAccessKeyId, awsSecretAccessKey, modules)
- .getInstance(S3Context.class);
- }
+ public static S3Context createS3Context(String awsAccessKeyId, String awsSecretAccessKey,
+ Module... modules) {
+ return createInjector(awsAccessKeyId, awsSecretAccessKey, modules).getInstance(
+ S3Context.class);
+ }
- public static Injector createInjector(String awsAccessKeyId,
- String awsSecretAccessKey, boolean isSecure, Module... modules) {
- Properties properties = new Properties(DEFAULT_PROPERTIES);
- properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
- properties
- .setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
- properties
- .setProperty(PROPERTY_HTTP_SECURE, Boolean.toString(isSecure));
- if (!isSecure)
- properties.setProperty(PROPERTY_HTTP_PORT, "80");
- return createInjector(properties, modules);
- }
+ public static Injector createInjector(String awsAccessKeyId, String awsSecretAccessKey,
+ boolean isSecure, Module... modules) {
+ Properties properties = new Properties(DEFAULT_PROPERTIES);
+ properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
+ properties.setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
+ properties.setProperty(PROPERTY_HTTP_SECURE, Boolean.toString(isSecure));
+ if (!isSecure)
+ properties.setProperty(PROPERTY_HTTP_PORT, "80");
+ return createInjector(properties, modules);
+ }
- public static S3Context createS3Context(String awsAccessKeyId,
- String awsSecretAccessKey, boolean isSecure, Module... modules) {
- return createInjector(awsAccessKeyId, awsSecretAccessKey, isSecure,
- modules).getInstance(S3Context.class);
- }
+ public static S3Context createS3Context(String awsAccessKeyId, String awsSecretAccessKey,
+ boolean isSecure, Module... modules) {
+ return createInjector(awsAccessKeyId, awsSecretAccessKey, isSecure, modules).getInstance(
+ S3Context.class);
+ }
- public static Injector createInjector(String awsAccessKeyId,
- String awsSecretAccessKey, boolean isSecure, String server,
- Module... modules) {
- Properties properties = new Properties(DEFAULT_PROPERTIES);
- properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
- properties
- .setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
- properties
- .setProperty(PROPERTY_HTTP_SECURE, Boolean.toString(isSecure));
- properties.setProperty(PROPERTY_HTTP_ADDRESS, server);
- if (!isSecure)
- properties.setProperty(PROPERTY_HTTP_PORT, "80");
- return createInjector(properties, modules);
- }
+ public static Injector createInjector(String awsAccessKeyId, String awsSecretAccessKey,
+ boolean isSecure, String server, Module... modules) {
+ Properties properties = new Properties(DEFAULT_PROPERTIES);
+ properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
+ properties.setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
+ properties.setProperty(PROPERTY_HTTP_SECURE, Boolean.toString(isSecure));
+ properties.setProperty(PROPERTY_HTTP_ADDRESS, server);
+ if (!isSecure)
+ properties.setProperty(PROPERTY_HTTP_PORT, "80");
+ return createInjector(properties, modules);
+ }
- public static S3Context createS3Context(String awsAccessKeyId,
- String awsSecretAccessKey, boolean isSecure, String server,
- Module... modules) {
- return createInjector(awsAccessKeyId, awsSecretAccessKey, isSecure,
- server, modules).getInstance(S3Context.class);
- }
+ public static S3Context createS3Context(String awsAccessKeyId, String awsSecretAccessKey,
+ boolean isSecure, String server, Module... modules) {
+ return createInjector(awsAccessKeyId, awsSecretAccessKey, isSecure, server, modules)
+ .getInstance(S3Context.class);
+ }
- public static S3Context createS3Context(String awsAccessKeyId,
- String awsSecretAccessKey, boolean isSecure, String server,
- int port, Module... modules) {
- return createInjector(awsAccessKeyId, awsSecretAccessKey, isSecure,
- server, port, modules).getInstance(S3Context.class);
- }
+ public static S3Context createS3Context(String awsAccessKeyId, String awsSecretAccessKey,
+ boolean isSecure, String server, int port, Module... modules) {
+ return createInjector(awsAccessKeyId, awsSecretAccessKey, isSecure, server, port, modules)
+ .getInstance(S3Context.class);
+ }
- public static Injector createInjector(String awsAccessKeyId,
- String awsSecretAccessKey, boolean isSecure, String server,
- int port, Module... modules) {
- Properties properties = new Properties(DEFAULT_PROPERTIES);
- properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
- properties
- .setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
- properties
- .setProperty(PROPERTY_HTTP_SECURE, Boolean.toString(isSecure));
- properties.setProperty(PROPERTY_HTTP_ADDRESS, server);
- properties.setProperty(PROPERTY_HTTP_PORT, port + "");
- return createInjector(properties, modules);
- }
+ public static Injector createInjector(String awsAccessKeyId, String awsSecretAccessKey,
+ boolean isSecure, String server, int port, Module... modules) {
+ Properties properties = new Properties(DEFAULT_PROPERTIES);
+ properties.setProperty(PROPERTY_AWS_ACCESSKEYID, awsAccessKeyId);
+ properties.setProperty(PROPERTY_AWS_SECRETACCESSKEY, awsSecretAccessKey);
+ properties.setProperty(PROPERTY_HTTP_SECURE, Boolean.toString(isSecure));
+ properties.setProperty(PROPERTY_HTTP_ADDRESS, server);
+ properties.setProperty(PROPERTY_HTTP_PORT, port + "");
+ return createInjector(properties, modules);
+ }
- public static S3Context createS3Context(Properties properties,
- Module... modules) {
- return createInjector(properties, modules).getInstance(S3Context.class);
- }
+ public static S3Context createS3Context(Properties properties, Module... modules) {
+ return createInjector(properties, modules).getInstance(S3Context.class);
+ }
- /**
- * Bind the given properties and install the list of modules. If no modules
- * are specified, install the default {@link JDKLoggingModule}
- * {@link JavaUrlHttpFutureCommandClientModule}
- *
- * @param properties - contains constants used by jclouds
- * {@link #DEFAULT_PROPERTIES}
- * @param configModules - alternative configuration modules
- */
- public static Injector createInjector(final Properties properties,
- Module... configModules) {
- final List modules = Lists.newArrayList(configModules);
+ /**
+ * Bind the given properties and install the list of modules. If no modules are specified,
+ * install the default {@link JDKLoggingModule} {@link JavaUrlHttpFutureCommandClientModule}
+ *
+ * @param properties
+ * - contains constants used by jclouds {@link #DEFAULT_PROPERTIES}
+ * @param configModules
+ * - alternative configuration modules
+ */
+ public static Injector createInjector(final Properties properties, Module... configModules) {
+ final List modules = Lists.newArrayList(configModules);
- addLoggingModuleIfNotPresent(modules);
+ addLoggingModuleIfNotPresent(modules);
- addHttpModuleIfNeededAndNotPresent(modules);
+ addHttpModuleIfNeededAndNotPresent(modules);
- addS3ConnectionModuleIfNotPresent(modules);
+ addS3ConnectionModuleIfNotPresent(modules);
- return Guice.createInjector(new AbstractModule() {
- @Override
- protected void configure() {
- Names.bindProperties(binder(), checkNotNull(properties,
- "properties"));
- for (Module module : modules)
- install(module);
- }
- }, new S3ContextModule());
- }
+ return Guice.createInjector(new AbstractModule() {
+ @Override
+ protected void configure() {
+ Names.bindProperties(binder(), checkNotNull(properties, "properties"));
+ for (Module module : modules)
+ install(module);
+ }
+ }, new S3ContextModule());
+ }
- @VisibleForTesting
- static void addHttpModuleIfNeededAndNotPresent(final List modules) {
- if (Iterables.any(modules, new Predicate() {
- public boolean apply(Module input) {
- return input instanceof LiveS3ConnectionModule;
- }
+ @VisibleForTesting
+ static void addHttpModuleIfNeededAndNotPresent(final List modules) {
+ if (Iterables.any(modules, new Predicate() {
+ public boolean apply(Module input) {
+ return input instanceof LiveS3ConnectionModule;
+ }
- }) && (!Iterables.any(modules, new Predicate() {
- public boolean apply(Module input) {
- return input.getClass().isAnnotationPresent(
- HttpFutureCommandClientModule.class);
- }
+ }) && (!Iterables.any(modules, new Predicate() {
+ public boolean apply(Module input) {
+ return input.getClass().isAnnotationPresent(HttpFutureCommandClientModule.class);
+ }
- })))
- modules.add(new JavaUrlHttpFutureCommandClientModule());
- }
+ })))
+ modules.add(new JavaUrlHttpFutureCommandClientModule());
+ }
- @VisibleForTesting
- static void addS3ConnectionModuleIfNotPresent(final List modules) {
- if (!Iterables.any(modules, new Predicate() {
- public boolean apply(Module input) {
- return input.getClass().isAnnotationPresent(
- S3ConnectionModule
- .class);
- }
+ @VisibleForTesting
+ static void addS3ConnectionModuleIfNotPresent(final List modules) {
+ if (!Iterables.any(modules, new Predicate() {
+ public boolean apply(Module input) {
+ return input.getClass().isAnnotationPresent(S3ConnectionModule.class);
+ }
- })){
- modules.add(new LiveS3ConnectionModule());
- }
- }
+ })) {
+ modules.add(new LiveS3ConnectionModule());
+ }
+ }
- @VisibleForTesting
- static void addLoggingModuleIfNotPresent(final List modules) {
- if (!Iterables.any(modules, Predicates.instanceOf(LoggingModule.class)))
- modules.add(new JDKLoggingModule());
- }
+ @VisibleForTesting
+ static void addLoggingModuleIfNotPresent(final List modules) {
+ if (!Iterables.any(modules, Predicates.instanceOf(LoggingModule.class)))
+ modules.add(new JDKLoggingModule());
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3CommandFactory.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3CommandFactory.java
index 1cddd73e9a..ecbec7740e 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3CommandFactory.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3CommandFactory.java
@@ -41,112 +41,103 @@ import com.google.inject.name.Named;
* @author Adrian Cole
*/
public class S3CommandFactory {
- @Inject
- private S3ParserFactory parserFactory;
+ @Inject
+ private S3ParserFactory parserFactory;
- @Inject
- private DeleteBucketFactory deleteBucketFactory;
+ @Inject
+ private DeleteBucketFactory deleteBucketFactory;
- public static interface DeleteBucketFactory {
- DeleteBucket create(String bucket);
- }
+ public static interface DeleteBucketFactory {
+ DeleteBucket create(String bucket);
+ }
- public DeleteBucket createDeleteBucket(String bucket) {
- return deleteBucketFactory.create(bucket);
- }
+ public DeleteBucket createDeleteBucket(String bucket) {
+ return deleteBucketFactory.create(bucket);
+ }
- @Inject
- private DeleteObjectFactory deleteObjectFactory;
+ @Inject
+ private DeleteObjectFactory deleteObjectFactory;
- public static interface DeleteObjectFactory {
- DeleteObject create(@Assisted("bucketName") String bucket,
- @Assisted("key") String key);
- }
+ public static interface DeleteObjectFactory {
+ DeleteObject create(@Assisted("bucketName") String bucket, @Assisted("key") String key);
+ }
- public DeleteObject createDeleteObject(String bucket, String key) {
- return deleteObjectFactory.create(bucket, key);
- }
+ public DeleteObject createDeleteObject(String bucket, String key) {
+ return deleteObjectFactory.create(bucket, key);
+ }
- @Inject
- private BucketExistsFactory headBucketFactory;
+ @Inject
+ private BucketExistsFactory headBucketFactory;
- public static interface BucketExistsFactory {
- BucketExists create(String bucket);
- }
+ public static interface BucketExistsFactory {
+ BucketExists create(String bucket);
+ }
- public BucketExists createHeadBucket(String bucket) {
- return headBucketFactory.create(bucket);
- }
+ public BucketExists createHeadBucket(String bucket) {
+ return headBucketFactory.create(bucket);
+ }
- @Inject
- private PutBucketFactory putBucketFactoryOptions;
+ @Inject
+ private PutBucketFactory putBucketFactoryOptions;
- public static interface PutBucketFactory {
- PutBucket create(String bucket, PutBucketOptions options);
- }
+ public static interface PutBucketFactory {
+ PutBucket create(String bucket, PutBucketOptions options);
+ }
- public PutBucket createPutBucket(String bucket, PutBucketOptions options) {
- return putBucketFactoryOptions.create(bucket, options);
- }
+ public PutBucket createPutBucket(String bucket, PutBucketOptions options) {
+ return putBucketFactoryOptions.create(bucket, options);
+ }
- @Inject
- private PutObjectFactory putObjectFactory;
+ @Inject
+ private PutObjectFactory putObjectFactory;
- public static interface PutObjectFactory {
- PutObject create(String bucket, S3Object object,
- PutObjectOptions options);
- }
+ public static interface PutObjectFactory {
+ PutObject create(String bucket, S3Object object, PutObjectOptions options);
+ }
- public PutObject createPutObject(String bucket, S3Object s3Object,
- PutObjectOptions options) {
- return putObjectFactory.create(bucket, s3Object, options);
- }
+ public PutObject createPutObject(String bucket, S3Object s3Object, PutObjectOptions options) {
+ return putObjectFactory.create(bucket, s3Object, options);
+ }
- @Inject
- private GetObjectFactory getObjectFactory;
+ @Inject
+ private GetObjectFactory getObjectFactory;
- public static interface GetObjectFactory {
- GetObject create(@Assisted("bucketName") String bucket,
- @Assisted("key") String key, GetObjectOptions options);
- }
+ public static interface GetObjectFactory {
+ GetObject create(@Assisted("bucketName") String bucket, @Assisted("key") String key,
+ GetObjectOptions options);
+ }
- public GetObject createGetObject(String bucket, String key,
- GetObjectOptions options) {
- return getObjectFactory.create(bucket, key, options);
- }
+ public GetObject createGetObject(String bucket, String key, GetObjectOptions options) {
+ return getObjectFactory.create(bucket, key, options);
+ }
- @Inject
- private HeadMetadataFactory headMetadataFactory;
+ @Inject
+ private HeadMetadataFactory headMetadataFactory;
- public static interface HeadMetadataFactory {
- HeadObject create(@Assisted("bucketName") String bucket,
- @Assisted("key") String key);
- }
+ public static interface HeadMetadataFactory {
+ HeadObject create(@Assisted("bucketName") String bucket, @Assisted("key") String key);
+ }
- public HeadObject createHeadMetadata(String bucket, String key) {
- return headMetadataFactory.create(bucket, key);
- }
+ public HeadObject createHeadMetadata(String bucket, String key) {
+ return headMetadataFactory.create(bucket, key);
+ }
- @Inject
- @Named("jclouds.http.address")
- String amazonHost;
+ @Inject
+ @Named("jclouds.http.address")
+ String amazonHost;
- public ListOwnedBuckets createGetMetadataForOwnedBuckets() {
- return new ListOwnedBuckets(amazonHost, parserFactory
- .createListBucketsParser());
- }
+ public ListOwnedBuckets createGetMetadataForOwnedBuckets() {
+ return new ListOwnedBuckets(amazonHost, parserFactory.createListBucketsParser());
+ }
- public ListBucket createListBucket(String bucket, ListBucketOptions options) {
- return new ListBucket(amazonHost, parserFactory
- .createListBucketParser(), bucket, options);
- }
+ public ListBucket createListBucket(String bucket, ListBucketOptions options) {
+ return new ListBucket(amazonHost, parserFactory.createListBucketParser(), bucket, options);
+ }
- public CopyObject createCopyObject(String sourceBucket,
- String sourceObject, String destinationBucket,
- String destinationObject, CopyObjectOptions options) {
- return new CopyObject(amazonHost, parserFactory
- .createCopyObjectParser(), sourceBucket, sourceObject,
- destinationBucket, destinationObject, options);
- }
+ public CopyObject createCopyObject(String sourceBucket, String sourceObject,
+ String destinationBucket, String destinationObject, CopyObjectOptions options) {
+ return new CopyObject(amazonHost, parserFactory.createCopyObjectParser(), sourceBucket,
+ sourceObject, destinationBucket, destinationObject, options);
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3FutureCommand.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3FutureCommand.java
index 947cf79f65..05b5a24ef1 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3FutureCommand.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/S3FutureCommand.java
@@ -36,22 +36,20 @@ import org.jclouds.http.HttpFutureCommand;
*/
public class S3FutureCommand extends HttpFutureCommand {
- public S3FutureCommand(String method, String uri,
- ResponseCallable responseCallable, String amazonHost,
- String bucketName) {
- super(method, uri, responseCallable);
- addHostHeader(checkNotNull(amazonHost, "amazonHost"), checkNotNull(
- bucketName, "bucketName"));
- }
+ public S3FutureCommand(String method, String uri, ResponseCallable responseCallable,
+ String amazonHost, String bucketName) {
+ super(method, uri, responseCallable);
+ addHostHeader(checkNotNull(amazonHost, "amazonHost"), checkNotNull(bucketName, "bucketName"));
+ }
- public S3FutureCommand(String method, String uri,
- ResponseCallable responseCallable, String amazonHost) {
- super(method, uri, responseCallable);
- addHostHeader(checkNotNull(amazonHost, "amazonHost"));
- }
+ public S3FutureCommand(String method, String uri, ResponseCallable responseCallable,
+ String amazonHost) {
+ super(method, uri, responseCallable);
+ addHostHeader(checkNotNull(amazonHost, "amazonHost"));
+ }
- protected void addHostHeader(String amazonHost, String bucketName) {
- addHostHeader(checkNotNull(bucketName) + "." + amazonHost);
- }
+ protected void addHostHeader(String amazonHost, String bucketName) {
+ addHostHeader(checkNotNull(bucketName) + "." + amazonHost);
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/callables/ParseMetadataFromHeaders.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/callables/ParseMetadataFromHeaders.java
index 7dd2f7243c..5443e319cf 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/callables/ParseMetadataFromHeaders.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/callables/ParseMetadataFromHeaders.java
@@ -28,8 +28,8 @@ import java.util.Map.Entry;
import org.jclouds.aws.s3.domain.S3Object;
import org.jclouds.aws.s3.domain.S3Object.Metadata;
import org.jclouds.aws.s3.reference.S3Headers;
-import org.jclouds.aws.s3.util.DateService;
import org.jclouds.aws.s3.util.S3Utils;
+import org.jclouds.aws.util.DateService;
import org.jclouds.http.HttpException;
import org.jclouds.http.HttpFutureCommand;
import org.jclouds.http.HttpHeaders;
@@ -42,105 +42,88 @@ import com.google.inject.Inject;
* @see
* @author Adrian Cole
*/
-public class ParseMetadataFromHeaders extends
- HttpFutureCommand.ResponseCallable {
- private final DateService dateParser;
- private String key;
+public class ParseMetadataFromHeaders extends HttpFutureCommand.ResponseCallable {
+ private final DateService dateParser;
+ private String key;
- @Inject
- public ParseMetadataFromHeaders(DateService dateParser) {
- this.dateParser = dateParser;
- }
+ @Inject
+ public ParseMetadataFromHeaders(DateService dateParser) {
+ this.dateParser = dateParser;
+ }
- /**
- * parses the http response headers to create a new
- * {@link org.jclouds.aws.s3.domain.S3Object.Metadata} object.
- */
- public S3Object.Metadata call() throws HttpException {
- checkCode();
+ /**
+ * parses the http response headers to create a new
+ * {@link org.jclouds.aws.s3.domain.S3Object.Metadata} object.
+ */
+ public S3Object.Metadata call() throws HttpException {
+ checkCode();
- S3Object.Metadata metadata = new S3Object.Metadata(key);
- addAllHeadersTo(metadata);
+ S3Object.Metadata metadata = new S3Object.Metadata(key);
+ addAllHeadersTo(metadata);
- addUserMetadataTo(metadata);
- addMd5To(metadata);
+ addUserMetadataTo(metadata);
+ addMd5To(metadata);
- parseLastModifiedOrThrowException(metadata);
- setContentTypeOrThrowException(metadata);
- setContentLengthOrThrowException(metadata);
+ parseLastModifiedOrThrowException(metadata);
+ setContentTypeOrThrowException(metadata);
+ setContentLengthOrThrowException(metadata);
- metadata.setCacheControl(getResponse().getFirstHeaderOrNull(
- HttpHeaders.CACHE_CONTROL));
- metadata.setContentDisposition(getResponse().getFirstHeaderOrNull(
- HttpHeaders.CONTENT_DISPOSITION));
- metadata.setContentEncoding(getResponse().getFirstHeaderOrNull(
- HttpHeaders.CONTENT_ENCODING));
- return metadata;
+ metadata.setCacheControl(getResponse().getFirstHeaderOrNull(HttpHeaders.CACHE_CONTROL));
+ metadata.setContentDisposition(getResponse().getFirstHeaderOrNull(
+ HttpHeaders.CONTENT_DISPOSITION));
+ metadata.setContentEncoding(getResponse().getFirstHeaderOrNull(HttpHeaders.CONTENT_ENCODING));
+ return metadata;
- }
+ }
- private void addAllHeadersTo(Metadata metadata) {
- metadata.getAllHeaders().putAll(getResponse().getHeaders());
- }
+ private void addAllHeadersTo(Metadata metadata) {
+ metadata.getAllHeaders().putAll(getResponse().getHeaders());
+ }
- private void setContentTypeOrThrowException(S3Object.Metadata metadata)
- throws HttpException {
- String contentType = getResponse().getFirstHeaderOrNull(
- HttpHeaders.CONTENT_TYPE);
- if (contentType == null)
- throw new HttpException(HttpHeaders.CONTENT_TYPE
- + " not found in headers");
- else
- metadata.setContentType(contentType);
- }
+ private void setContentTypeOrThrowException(S3Object.Metadata metadata) throws HttpException {
+ String contentType = getResponse().getFirstHeaderOrNull(HttpHeaders.CONTENT_TYPE);
+ if (contentType == null)
+ throw new HttpException(HttpHeaders.CONTENT_TYPE + " not found in headers");
+ else
+ metadata.setContentType(contentType);
+ }
- private void setContentLengthOrThrowException(S3Object.Metadata metadata)
- throws HttpException {
- String contentLength = getResponse().getFirstHeaderOrNull(
- HttpHeaders.CONTENT_LENGTH);
- if (contentLength == null)
- throw new HttpException(HttpHeaders.CONTENT_LENGTH
- + " not found in headers");
- else
- metadata.setSize(Long.parseLong(contentLength));
- }
+ private void setContentLengthOrThrowException(S3Object.Metadata metadata) throws HttpException {
+ String contentLength = getResponse().getFirstHeaderOrNull(HttpHeaders.CONTENT_LENGTH);
+ if (contentLength == null)
+ throw new HttpException(HttpHeaders.CONTENT_LENGTH + " not found in headers");
+ else
+ metadata.setSize(Long.parseLong(contentLength));
+ }
- private void parseLastModifiedOrThrowException(S3Object.Metadata metadata)
- throws HttpException {
- String lastModified = getResponse().getFirstHeaderOrNull(
- HttpHeaders.LAST_MODIFIED);
- metadata.setLastModified(dateParser
- .rfc822DateParse(lastModified));
- if (metadata.getLastModified() == null)
- throw new HttpException("could not parse: "
- + HttpHeaders.LAST_MODIFIED + ": " + lastModified);
- }
+ private void parseLastModifiedOrThrowException(S3Object.Metadata metadata) throws HttpException {
+ String lastModified = getResponse().getFirstHeaderOrNull(HttpHeaders.LAST_MODIFIED);
+ metadata.setLastModified(dateParser.rfc822DateParse(lastModified));
+ if (metadata.getLastModified() == null)
+ throw new HttpException("could not parse: " + HttpHeaders.LAST_MODIFIED + ": "
+ + lastModified);
+ }
- private void addMd5To(S3Object.Metadata metadata) {
- String md5Header = getResponse()
- .getFirstHeaderOrNull(S3Headers.AMZ_MD5);
- if (md5Header != null) {
- metadata.setMd5(S3Utils.fromHexString(md5Header));
- }
- String eTag = getResponse().getFirstHeaderOrNull(S3Headers.ETAG);
- if (metadata.getMd5() == null && eTag != null) {
- metadata.setMd5(S3Utils.fromHexString(eTag.replaceAll("\"", "")));
- }
- }
+ private void addMd5To(S3Object.Metadata metadata) {
+ String md5Header = getResponse().getFirstHeaderOrNull(S3Headers.AMZ_MD5);
+ if (md5Header != null) {
+ metadata.setMd5(S3Utils.fromHexString(md5Header));
+ }
+ String eTag = getResponse().getFirstHeaderOrNull(S3Headers.ETAG);
+ if (metadata.getMd5() == null && eTag != null) {
+ metadata.setMd5(S3Utils.fromHexString(eTag.replaceAll("\"", "")));
+ }
+ }
- private void addUserMetadataTo(S3Object.Metadata metadata) {
- for (Entry header : getResponse().getHeaders()
- .entries()) {
- if (header.getKey() != null
- && header.getKey().startsWith(
- S3Headers.USER_METADATA_PREFIX))
- metadata.getUserMetadata().put(header.getKey(),
- header.getValue());
- }
- }
+ private void addUserMetadataTo(S3Object.Metadata metadata) {
+ for (Entry header : getResponse().getHeaders().entries()) {
+ if (header.getKey() != null && header.getKey().startsWith(S3Headers.USER_METADATA_PREFIX))
+ metadata.getUserMetadata().put(header.getKey(), header.getValue());
+ }
+ }
- public void setKey(String key) {
- this.key = key;
- }
+ public void setKey(String key) {
+ this.key = key;
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/CopyObjectOptions.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/CopyObjectOptions.java
index 6293a6191b..cd80de4a32 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/CopyObjectOptions.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/CopyObjectOptions.java
@@ -23,25 +23,29 @@
*/
package org.jclouds.aws.s3.commands.options;
-import com.google.common.base.Preconditions;
-import static com.google.common.base.Preconditions.*;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Preconditions.checkState;
+
+import java.io.UnsupportedEncodingException;
+
import org.jclouds.aws.s3.domain.acl.CannedAccessPolicy;
import org.jclouds.aws.s3.reference.S3Headers;
-import org.jclouds.aws.s3.util.DateService;
import org.jclouds.aws.s3.util.S3Utils;
+import org.jclouds.aws.util.DateService;
import org.jclouds.http.options.BaseHttpRequestOptions;
import org.joda.time.DateTime;
-import java.io.UnsupportedEncodingException;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
/**
* Contains options supported in the REST API for the COPY object operation.
*
- * Usage
The recommended way to instantiate a CopyObjectOptions object
- * is to statically import CopyObjectOptions.Builder.* and invoke a static
- * creation method followed by an instance mutator (if needed):
+ * Usage
The recommended way to instantiate a CopyObjectOptions object is to statically
+ * import CopyObjectOptions.Builder.* and invoke a static creation method followed by an instance
+ * mutator (if needed):
*
*
* import static org.jclouds.aws.s3.commands.options.CopyObjectOptions.Builder.*
@@ -59,269 +63,260 @@ import java.io.UnsupportedEncodingException;
* ifSourceModifiedSince(new DateTime().minusDays(1))
* );
*
- *
+ *
* @author Adrian Cole
- * @see
*/
public class CopyObjectOptions extends BaseHttpRequestOptions {
- private final static DateService dateService = new DateService();
+ private final static DateService dateService = new DateService();
- public static final CopyObjectOptions NONE = new CopyObjectOptions();
+ public static final CopyObjectOptions NONE = new CopyObjectOptions();
- private Multimap metadata;
+ private Multimap metadata;
- private CannedAccessPolicy acl = CannedAccessPolicy.PRIVATE;
+ private CannedAccessPolicy acl = CannedAccessPolicy.PRIVATE;
- /**
- * Override the default ACL (private) with the specified one.
- *
- * @see CannedAccessPolicy
- */
- public CopyObjectOptions overrideAcl(CannedAccessPolicy acl) {
- this.acl = checkNotNull(acl, "acl");
- if (!acl.equals(CannedAccessPolicy.PRIVATE))
- this.replaceHeader(S3Headers.CANNED_ACL, acl.toString());
- return this;
- }
+ /**
+ * Override the default ACL (private) with the specified one.
+ *
+ * @see CannedAccessPolicy
+ */
+ public CopyObjectOptions overrideAcl(CannedAccessPolicy acl) {
+ this.acl = checkNotNull(acl, "acl");
+ if (!acl.equals(CannedAccessPolicy.PRIVATE))
+ this.replaceHeader(S3Headers.CANNED_ACL, acl.toString());
+ return this;
+ }
- /**
- * @see CopyObjectOptions#overrideAcl(CannedAccessPolicy)
- */
- public CannedAccessPolicy getAcl() {
- return acl;
- }
+ /**
+ * @see CopyObjectOptions#overrideAcl(CannedAccessPolicy)
+ */
+ public CannedAccessPolicy getAcl() {
+ return acl;
+ }
- /**
- * For use in the header x-amz-copy-source-if-unmodified-since
- *
- * Copies the object if it hasn't been modified since the specified time;
- * otherwise returns a 412 (precondition failed).
- *
- * This header can be used with x-amz-copy-source-if-match, but cannot be
- * used with other conditional copy headers.
- *
- * @return valid HTTP date
- * @see
- * @see CopyObjectOptions#ifSourceModifiedSince(DateTime)
- */
- public String getIfModifiedSince() {
- return getFirstHeaderOrNull("x-amz-copy-source-if-modified-since");
- }
+ /**
+ * For use in the header x-amz-copy-source-if-unmodified-since
+ *
+ * Copies the object if it hasn't been modified since the specified time; otherwise returns a 412
+ * (precondition failed).
+ *
+ * This header can be used with x-amz-copy-source-if-match, but cannot be used with other
+ * conditional copy headers.
+ *
+ * @return valid HTTP date
+ * @see
+ * @see CopyObjectOptions#ifSourceModifiedSince(DateTime)
+ */
+ public String getIfModifiedSince() {
+ return getFirstHeaderOrNull("x-amz-copy-source-if-modified-since");
+ }
- /**
- * For use in the header x-amz-copy-source-if-modified-since
- *
- * Copies the object if it has been modified since the specified time;
- * otherwise returns a 412 (failed condition).
- *
- * This header can be used with x-amz-copy-source-if-none-match, but cannot
- * be used with other conditional copy headers.
- *
- * @return valid HTTP date
- * @see
- * @see CopyObjectOptions#ifSourceUnmodifiedSince(DateTime)
- */
- public String getIfUnmodifiedSince() {
- return getFirstHeaderOrNull("x-amz-copy-source-if-unmodified-since");
- }
+ /**
+ * For use in the header x-amz-copy-source-if-modified-since
+ *
+ * Copies the object if it has been modified since the specified time; otherwise returns a 412
+ * (failed condition).
+ *
+ * This header can be used with x-amz-copy-source-if-none-match, but cannot be used with other
+ * conditional copy headers.
+ *
+ * @return valid HTTP date
+ * @see
+ * @see CopyObjectOptions#ifSourceUnmodifiedSince(DateTime)
+ */
+ public String getIfUnmodifiedSince() {
+ return getFirstHeaderOrNull("x-amz-copy-source-if-unmodified-since");
+ }
- /**
- * For use in the request header: x-amz-copy-source-if-match
- *
- * Copies the object if its entity tag (ETag) matches the specified tag;
- * otherwise return a 412 (precondition failed).
- *
- * This header can be used with x-amz-copy-source-if-unmodified-since, but
- * cannot be used with other conditional copy headers.
- *
- * @see CopyObjectOptions#ifSourceMd5Matches(byte[])
- */
- public String getIfMatch() {
- return getFirstHeaderOrNull("x-amz-copy-source-if-match");
- }
+ /**
+ * For use in the request header: x-amz-copy-source-if-match
+ *
+ * Copies the object if its entity tag (ETag) matches the specified tag; otherwise return a 412
+ * (precondition failed).
+ *
+ * This header can be used with x-amz-copy-source-if-unmodified-since, but cannot be used with
+ * other conditional copy headers.
+ *
+ * @see CopyObjectOptions#ifSourceMd5Matches(byte[])
+ */
+ public String getIfMatch() {
+ return getFirstHeaderOrNull("x-amz-copy-source-if-match");
+ }
- /**
- * For use in the request header: x-amz-copy-source-if-none-match
- *
- * Copies the object if its entity tag (ETag) is different than the
- * specified Etag; otherwise returns a 412 (failed condition).
- *
- * This header can be used with x-amz-copy-source-if-modified-since, but
- * cannot be used with other conditional copy headers.
- *
- * @see CopyObjectOptions#ifSourceMd5DoesntMatch(byte[])
- */
- public String getIfNoneMatch() {
- return getFirstHeaderOrNull("x-amz-copy-source-if-none-match");
- }
+ /**
+ * For use in the request header: x-amz-copy-source-if-none-match
+ *
+ * Copies the object if its entity tag (ETag) is different than the specified Etag; otherwise
+ * returns a 412 (failed condition).
+ *
+ * This header can be used with x-amz-copy-source-if-modified-since, but cannot be used with
+ * other conditional copy headers.
+ *
+ * @see CopyObjectOptions#ifSourceMd5DoesntMatch(byte[])
+ */
+ public String getIfNoneMatch() {
+ return getFirstHeaderOrNull("x-amz-copy-source-if-none-match");
+ }
- /**
- * When not null, contains the header
- * [x-amz-copy-source-if-unmodified-since] -> [REPLACE] and metadata headers
- * passed in from the users.
- *
- * @see #overrideMetadataWith(Multimap)
- */
- public Multimap getMetadata() {
- return metadata;
- }
+ /**
+ * When not null, contains the header [x-amz-copy-source-if-unmodified-since] -> [REPLACE] and
+ * metadata headers passed in from the users.
+ *
+ * @see #overrideMetadataWith(Multimap)
+ */
+ public Multimap getMetadata() {
+ return metadata;
+ }
- /**
- * Only return the object if it has changed since this time.
- *
- * Not compatible with {@link #ifSourceMd5Matches(byte[])} or
- * {@link #ifSourceUnmodifiedSince(DateTime)}
- */
- public CopyObjectOptions ifSourceModifiedSince(DateTime ifModifiedSince) {
- checkState(getIfMatch() == null,
- "ifMd5Matches() is not compatible with ifModifiedSince()");
- checkState(getIfUnmodifiedSince() == null,
- "ifUnmodifiedSince() is not compatible with ifModifiedSince()");
- replaceHeader("x-amz-copy-source-if-modified-since",
- dateService.rfc822DateFormat(checkNotNull(ifModifiedSince,
- "ifModifiedSince")));
- return this;
- }
+ /**
+ * Only return the object if it has changed since this time.
+ *
+ * Not compatible with {@link #ifSourceMd5Matches(byte[])} or
+ * {@link #ifSourceUnmodifiedSince(DateTime)}
+ */
+ public CopyObjectOptions ifSourceModifiedSince(DateTime ifModifiedSince) {
+ checkState(getIfMatch() == null, "ifMd5Matches() is not compatible with ifModifiedSince()");
+ checkState(getIfUnmodifiedSince() == null,
+ "ifUnmodifiedSince() is not compatible with ifModifiedSince()");
+ replaceHeader("x-amz-copy-source-if-modified-since", dateService
+ .rfc822DateFormat(checkNotNull(ifModifiedSince, "ifModifiedSince")));
+ return this;
+ }
- /**
- * Only return the object if it hasn't changed since this time.
- *
- * Not compatible with {@link #ifSourceMd5DoesntMatch(byte[])} or
- * {@link #ifSourceModifiedSince(DateTime)}
- */
- public CopyObjectOptions ifSourceUnmodifiedSince(DateTime ifUnmodifiedSince) {
- checkState(getIfNoneMatch() == null,
- "ifMd5DoesntMatch() is not compatible with ifUnmodifiedSince()");
- checkState(getIfModifiedSince() == null,
- "ifModifiedSince() is not compatible with ifUnmodifiedSince()");
- replaceHeader("x-amz-copy-source-if-unmodified-since", dateService
- .rfc822DateFormat(checkNotNull(ifUnmodifiedSince,
- "ifUnmodifiedSince")));
- return this;
- }
+ /**
+ * Only return the object if it hasn't changed since this time.
+ *
+ * Not compatible with {@link #ifSourceMd5DoesntMatch(byte[])} or
+ * {@link #ifSourceModifiedSince(DateTime)}
+ */
+ public CopyObjectOptions ifSourceUnmodifiedSince(DateTime ifUnmodifiedSince) {
+ checkState(getIfNoneMatch() == null,
+ "ifMd5DoesntMatch() is not compatible with ifUnmodifiedSince()");
+ checkState(getIfModifiedSince() == null,
+ "ifModifiedSince() is not compatible with ifUnmodifiedSince()");
+ replaceHeader("x-amz-copy-source-if-unmodified-since", dateService
+ .rfc822DateFormat(checkNotNull(ifUnmodifiedSince, "ifUnmodifiedSince")));
+ return this;
+ }
- /**
- * The object's md5 hash should match the parameter md5.
- *
- *
- * Not compatible with {@link #ifSourceMd5DoesntMatch(byte[])} or
- * {@link #ifSourceModifiedSince(DateTime)}
- *
- * @param md5 hash representing the entity
- * @throws UnsupportedEncodingException if there was a problem converting this into an S3 eTag string
- */
- public CopyObjectOptions ifSourceMd5Matches(byte[] md5)
- throws UnsupportedEncodingException {
- checkState(getIfNoneMatch() == null,
- "ifMd5DoesntMatch() is not compatible with ifMd5Matches()");
- checkState(getIfModifiedSince() == null,
- "ifModifiedSince() is not compatible with ifMd5Matches()");
- replaceHeader("x-amz-copy-source-if-match", String.format("\"%1$s\"",
- S3Utils.toHexString(checkNotNull(md5, "md5"))));
- return this;
- }
+ /**
+ * The object's md5 hash should match the parameter md5.
+ *
+ *
+ * Not compatible with {@link #ifSourceMd5DoesntMatch(byte[])} or
+ * {@link #ifSourceModifiedSince(DateTime)}
+ *
+ * @param md5
+ * hash representing the entity
+ * @throws UnsupportedEncodingException
+ * if there was a problem converting this into an S3 eTag string
+ */
+ public CopyObjectOptions ifSourceMd5Matches(byte[] md5) throws UnsupportedEncodingException {
+ checkState(getIfNoneMatch() == null,
+ "ifMd5DoesntMatch() is not compatible with ifMd5Matches()");
+ checkState(getIfModifiedSince() == null,
+ "ifModifiedSince() is not compatible with ifMd5Matches()");
+ replaceHeader("x-amz-copy-source-if-match", String.format("\"%1$s\"", S3Utils
+ .toHexString(checkNotNull(md5, "md5"))));
+ return this;
+ }
- /**
- * The object should not have a md5 hash corresponding with the parameter
- * md5.
- *
- * Not compatible with {@link #ifSourceMd5Matches(byte[])} or
- * {@link #ifSourceUnmodifiedSince(DateTime)}
- *
- * @param md5 hash representing the entity
- * @throws UnsupportedEncodingException if there was a problem converting this into an S3 eTag string
- */
- public CopyObjectOptions ifSourceMd5DoesntMatch(byte[] md5)
- throws UnsupportedEncodingException {
- checkState(getIfMatch() == null,
- "ifMd5Matches() is not compatible with ifMd5DoesntMatch()");
- Preconditions
- .checkState(getIfUnmodifiedSince() == null,
- "ifUnmodifiedSince() is not compatible with ifMd5DoesntMatch()");
- replaceHeader("x-amz-copy-source-if-none-match", String.format(
- "\"%1$s\"", S3Utils.toHexString(checkNotNull(md5,
- "ifMd5DoesntMatch"))));
- return this;
- }
+ /**
+ * The object should not have a md5 hash corresponding with the parameter md5.
+ *
+ * Not compatible with {@link #ifSourceMd5Matches(byte[])} or
+ * {@link #ifSourceUnmodifiedSince(DateTime)}
+ *
+ * @param md5
+ * hash representing the entity
+ * @throws UnsupportedEncodingException
+ * if there was a problem converting this into an S3 eTag string
+ */
+ public CopyObjectOptions ifSourceMd5DoesntMatch(byte[] md5) throws UnsupportedEncodingException {
+ checkState(getIfMatch() == null, "ifMd5Matches() is not compatible with ifMd5DoesntMatch()");
+ Preconditions.checkState(getIfUnmodifiedSince() == null,
+ "ifUnmodifiedSince() is not compatible with ifMd5DoesntMatch()");
+ replaceHeader("x-amz-copy-source-if-none-match", String.format("\"%1$s\"", S3Utils
+ .toHexString(checkNotNull(md5, "ifMd5DoesntMatch"))));
+ return this;
+ }
- @Override
- public Multimap buildRequestHeaders() {
- Multimap returnVal = HashMultimap.create();
- returnVal.putAll(headers);
- if (metadata != null) {
- returnVal.putAll(metadata);
- returnVal.put("x-amz-metadata-directive", "REPLACE");
- }
- return returnVal;
- }
+ @Override
+ public Multimap buildRequestHeaders() {
+ Multimap returnVal = HashMultimap.create();
+ returnVal.putAll(headers);
+ if (metadata != null) {
+ returnVal.putAll(metadata);
+ returnVal.put("x-amz-metadata-directive", "REPLACE");
+ }
+ return returnVal;
+ }
- /**
- * Use the provided metadata instead of what is on the source object.
- */
- public CopyObjectOptions overrideMetadataWith(
- Multimap metadata) {
- checkNotNull(metadata, "metadata");
- for (String header : metadata.keySet()) {
- checkArgument(header.startsWith("x-amz-meta-"),
- "Metadata keys must start with x-amz-meta-");
- }
- this.metadata = metadata;
- return this;
- }
+ /**
+ * Use the provided metadata instead of what is on the source object.
+ */
+ public CopyObjectOptions overrideMetadataWith(Multimap metadata) {
+ checkNotNull(metadata, "metadata");
+ for (String header : metadata.keySet()) {
+ checkArgument(header.startsWith("x-amz-meta-"),
+ "Metadata keys must start with x-amz-meta-");
+ }
+ this.metadata = metadata;
+ return this;
+ }
- public static class Builder {
- /**
- * @see CopyObjectOptions#overrideAcl(CannedAccessPolicy)
- */
- public static CopyObjectOptions overrideAcl(CannedAccessPolicy acl) {
- CopyObjectOptions options = new CopyObjectOptions();
- return options.overrideAcl(acl);
- }
+ public static class Builder {
+ /**
+ * @see CopyObjectOptions#overrideAcl(CannedAccessPolicy)
+ */
+ public static CopyObjectOptions overrideAcl(CannedAccessPolicy acl) {
+ CopyObjectOptions options = new CopyObjectOptions();
+ return options.overrideAcl(acl);
+ }
- /**
- * @see CopyObjectOptions#getIfModifiedSince()
- */
- public static CopyObjectOptions ifSourceModifiedSince(
- DateTime ifModifiedSince) {
- CopyObjectOptions options = new CopyObjectOptions();
- return options.ifSourceModifiedSince(ifModifiedSince);
- }
+ /**
+ * @see CopyObjectOptions#getIfModifiedSince()
+ */
+ public static CopyObjectOptions ifSourceModifiedSince(DateTime ifModifiedSince) {
+ CopyObjectOptions options = new CopyObjectOptions();
+ return options.ifSourceModifiedSince(ifModifiedSince);
+ }
- /**
- * @see CopyObjectOptions#ifSourceUnmodifiedSince(DateTime)
- */
- public static CopyObjectOptions ifSourceUnmodifiedSince(
- DateTime ifUnmodifiedSince) {
- CopyObjectOptions options = new CopyObjectOptions();
- return options.ifSourceUnmodifiedSince(ifUnmodifiedSince);
- }
+ /**
+ * @see CopyObjectOptions#ifSourceUnmodifiedSince(DateTime)
+ */
+ public static CopyObjectOptions ifSourceUnmodifiedSince(DateTime ifUnmodifiedSince) {
+ CopyObjectOptions options = new CopyObjectOptions();
+ return options.ifSourceUnmodifiedSince(ifUnmodifiedSince);
+ }
- /**
- * @see CopyObjectOptions#ifSourceMd5Matches(byte[])
- */
- public static CopyObjectOptions ifSourceMd5Matches(byte[] md5)
- throws UnsupportedEncodingException {
- CopyObjectOptions options = new CopyObjectOptions();
- return options.ifSourceMd5Matches(md5);
- }
+ /**
+ * @see CopyObjectOptions#ifSourceMd5Matches(byte[])
+ */
+ public static CopyObjectOptions ifSourceMd5Matches(byte[] md5)
+ throws UnsupportedEncodingException {
+ CopyObjectOptions options = new CopyObjectOptions();
+ return options.ifSourceMd5Matches(md5);
+ }
- /**
- * @see CopyObjectOptions#ifSourceMd5DoesntMatch(byte[])
- */
- public static CopyObjectOptions ifSourceMd5DoesntMatch(byte[] md5)
- throws UnsupportedEncodingException {
- CopyObjectOptions options = new CopyObjectOptions();
- return options.ifSourceMd5DoesntMatch(md5);
- }
+ /**
+ * @see CopyObjectOptions#ifSourceMd5DoesntMatch(byte[])
+ */
+ public static CopyObjectOptions ifSourceMd5DoesntMatch(byte[] md5)
+ throws UnsupportedEncodingException {
+ CopyObjectOptions options = new CopyObjectOptions();
+ return options.ifSourceMd5DoesntMatch(md5);
+ }
- /**
- * @see #overrideMetadataWith(Multimap)
- */
- public static CopyObjectOptions overrideMetadataWith(
- Multimap metadata) {
- CopyObjectOptions options = new CopyObjectOptions();
- return options.overrideMetadataWith(metadata);
- }
- }
+ /**
+ * @see #overrideMetadataWith(Multimap)
+ */
+ public static CopyObjectOptions overrideMetadataWith(Multimap metadata) {
+ CopyObjectOptions options = new CopyObjectOptions();
+ return options.overrideMetadataWith(metadata);
+ }
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/GetObjectOptions.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/GetObjectOptions.java
index d1c96790b4..c1ff51b999 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/GetObjectOptions.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/GetObjectOptions.java
@@ -23,14 +23,15 @@
*/
package org.jclouds.aws.s3.commands.options;
-import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
-import org.jclouds.aws.s3.util.DateService;
import org.jclouds.aws.s3.util.S3Utils;
+import org.jclouds.aws.util.DateService;
import org.jclouds.http.HttpHeaders;
import org.jclouds.http.options.BaseHttpRequestOptions;
import org.joda.time.DateTime;
@@ -40,9 +41,9 @@ import com.google.common.collect.Multimap;
/**
* Contains options supported in the REST API for the GET object operation.
- * Usage
The recommended way to instantiate a GetObjectOptions object is to
- * statically import GetObjectOptions.Builder.* and invoke a static creation
- * method followed by an instance mutator (if needed):
+ * Usage The recommended way to instantiate a GetObjectOptions object is to statically import
+ * GetObjectOptions.Builder.* and invoke a static creation method followed by an instance mutator
+ * (if needed):
*
*
* import static org.jclouds.aws.s3.commands.options.GetObjectOptions.Builder.*
@@ -53,254 +54,241 @@ import com.google.common.collect.Multimap;
* Future object = connection.getObject("bucket","objectName",range(0,1024).ifUnmodifiedSince(new DateTime().minusDays(1)));
*
*
- * @see
* @author Adrian Cole
*
*
*/
public class GetObjectOptions extends BaseHttpRequestOptions {
- private final static DateService dateService = new DateService();
- public static final GetObjectOptions NONE = new GetObjectOptions();
- private final List ranges = new ArrayList();
+ private final static DateService dateService = new DateService();
+ public static final GetObjectOptions NONE = new GetObjectOptions();
+ private final List ranges = new ArrayList();
- @Override
- public Multimap buildRequestHeaders() {
- Multimap headers = super.buildRequestHeaders();
- String range = getRange();
- if (range != null)
- headers.put(HttpHeaders.RANGE, this.getRange());
- return headers;
- }
+ @Override
+ public Multimap buildRequestHeaders() {
+ Multimap headers = super.buildRequestHeaders();
+ String range = getRange();
+ if (range != null)
+ headers.put(HttpHeaders.RANGE, this.getRange());
+ return headers;
+ }
- /**
- * download the specified range of the object.
- */
- public GetObjectOptions range(long start, long end) {
- checkArgument(start >= 0, "start must be >= 0");
- checkArgument(end >= 0, "end must be >= 0");
- ranges.add(String.format("%d-%d", start, end));
- return this;
- }
+ /**
+ * download the specified range of the object.
+ */
+ public GetObjectOptions range(long start, long end) {
+ checkArgument(start >= 0, "start must be >= 0");
+ checkArgument(end >= 0, "end must be >= 0");
+ ranges.add(String.format("%d-%d", start, end));
+ return this;
+ }
- /**
- * download the object offset at start
- */
- public GetObjectOptions startAt(long start) {
- checkArgument(start >= 0, "start must be >= 0");
- ranges.add(String.format("%d-", start));
- return this;
- }
+ /**
+ * download the object offset at start
+ */
+ public GetObjectOptions startAt(long start) {
+ checkArgument(start >= 0, "start must be >= 0");
+ ranges.add(String.format("%d-", start));
+ return this;
+ }
- /**
- * download the last count bytes of the object
- */
- public GetObjectOptions tail(long count) {
- checkArgument(count > 0, "count must be > 0");
- ranges.add(String.format("-%d", count));
- return this;
- }
+ /**
+ * download the last count bytes of the object
+ */
+ public GetObjectOptions tail(long count) {
+ checkArgument(count > 0, "count must be > 0");
+ ranges.add(String.format("-%d", count));
+ return this;
+ }
- /**
- * For use in the header Range
- *
- *
- * @see GetObjectOptions#range(long, long)
- */
- public String getRange() {
- return (ranges.size() > 0) ? String.format("bytes=%s", Joiner.on(",")
- .join(ranges)) : null;
- }
+ /**
+ * For use in the header Range
+ *
+ *
+ * @see GetObjectOptions#range(long, long)
+ */
+ public String getRange() {
+ return (ranges.size() > 0) ? String.format("bytes=%s", Joiner.on(",").join(ranges)) : null;
+ }
- /**
- * Only return the object if it has changed since this time.
- *
- * Not compatible with {@link #ifMd5Matches(byte[])} or
- * {@link #ifUnmodifiedSince(DateTime)}
- */
- public GetObjectOptions ifModifiedSince(DateTime ifModifiedSince) {
- checkArgument(getIfMatch() == null,
- "ifMd5Matches() is not compatible with ifModifiedSince()");
- checkArgument(getIfUnmodifiedSince() == null,
- "ifUnmodifiedSince() is not compatible with ifModifiedSince()");
- this.headers.put(HttpHeaders.IF_MODIFIED_SINCE,
- dateService.rfc822DateFormat(checkNotNull(ifModifiedSince,
- "ifModifiedSince")));
- return this;
- }
+ /**
+ * Only return the object if it has changed since this time.
+ *
+ * Not compatible with {@link #ifMd5Matches(byte[])} or {@link #ifUnmodifiedSince(DateTime)}
+ */
+ public GetObjectOptions ifModifiedSince(DateTime ifModifiedSince) {
+ checkArgument(getIfMatch() == null, "ifMd5Matches() is not compatible with ifModifiedSince()");
+ checkArgument(getIfUnmodifiedSince() == null,
+ "ifUnmodifiedSince() is not compatible with ifModifiedSince()");
+ this.headers.put(HttpHeaders.IF_MODIFIED_SINCE, dateService.rfc822DateFormat(checkNotNull(
+ ifModifiedSince, "ifModifiedSince")));
+ return this;
+ }
- /**
- * For use in the header If-Modified-Since
- *
- * Return the object only if it has been modified since the specified time,
- * otherwise return a 304 (not modified).
- *
- * @see GetObjectOptions#ifModifiedSince(DateTime)
- */
- public String getIfModifiedSince() {
- return this.getFirstHeaderOrNull(HttpHeaders.IF_MODIFIED_SINCE);
- }
+ /**
+ * For use in the header If-Modified-Since
+ *
+ * Return the object only if it has been modified since the specified time, otherwise return a
+ * 304 (not modified).
+ *
+ * @see GetObjectOptions#ifModifiedSince(DateTime)
+ */
+ public String getIfModifiedSince() {
+ return this.getFirstHeaderOrNull(HttpHeaders.IF_MODIFIED_SINCE);
+ }
- /**
- * Only return the object if it hasn't changed since this time.
- *
- * Not compatible with {@link #ifMd5DoesntMatch(byte[])} or
- * {@link #ifModifiedSince(DateTime)}
- */
- public GetObjectOptions ifUnmodifiedSince(DateTime ifUnmodifiedSince) {
- checkArgument(getIfNoneMatch() == null,
- "ifMd5DoesntMatch() is not compatible with ifUnmodifiedSince()");
- checkArgument(getIfModifiedSince() == null,
- "ifModifiedSince() is not compatible with ifUnmodifiedSince()");
- this.headers.put(HttpHeaders.IF_UNMODIFIED_SINCE, dateService
- .rfc822DateFormat(checkNotNull(ifUnmodifiedSince,
- "ifUnmodifiedSince")));
- return this;
- }
+ /**
+ * Only return the object if it hasn't changed since this time.
+ *
+ * Not compatible with {@link #ifMd5DoesntMatch(byte[])} or {@link #ifModifiedSince(DateTime)}
+ */
+ public GetObjectOptions ifUnmodifiedSince(DateTime ifUnmodifiedSince) {
+ checkArgument(getIfNoneMatch() == null,
+ "ifMd5DoesntMatch() is not compatible with ifUnmodifiedSince()");
+ checkArgument(getIfModifiedSince() == null,
+ "ifModifiedSince() is not compatible with ifUnmodifiedSince()");
+ this.headers.put(HttpHeaders.IF_UNMODIFIED_SINCE, dateService.rfc822DateFormat(checkNotNull(
+ ifUnmodifiedSince, "ifUnmodifiedSince")));
+ return this;
+ }
- /**
- * For use in the header If-Unmodified-Since
- *
- * Return the object only if it has not been modified since the specified
- * time, otherwise return a 412 (precondition failed).
- *
- * @see GetObjectOptions#ifUnmodifiedSince(DateTime)
- */
- public String getIfUnmodifiedSince() {
- return this.getFirstHeaderOrNull(HttpHeaders.IF_UNMODIFIED_SINCE);
- }
+ /**
+ * For use in the header If-Unmodified-Since
+ *
+ * Return the object only if it has not been modified since the specified time, otherwise return
+ * a 412 (precondition failed).
+ *
+ * @see GetObjectOptions#ifUnmodifiedSince(DateTime)
+ */
+ public String getIfUnmodifiedSince() {
+ return this.getFirstHeaderOrNull(HttpHeaders.IF_UNMODIFIED_SINCE);
+ }
- /**
- * The object's md5 hash should match the parameter md5.
- *
- *
- * Not compatible with {@link #ifMd5DoesntMatch(byte[])} or
- * {@link #ifModifiedSince(DateTime)}
- *
- * @param md5
- * hash representing the entity
- * @throws UnsupportedEncodingException
- * if there was a problem converting this into an S3 eTag string
- */
- public GetObjectOptions ifMd5Matches(byte[] md5)
- throws UnsupportedEncodingException {
- checkArgument(getIfNoneMatch() == null,
- "ifMd5DoesntMatch() is not compatible with ifMd5Matches()");
- checkArgument(getIfModifiedSince() == null,
- "ifModifiedSince() is not compatible with ifMd5Matches()");
- this.headers.put(HttpHeaders.IF_MATCH, String.format("\"%1$s\"",
- S3Utils.toHexString(checkNotNull(md5, "md5"))));
- return this;
- }
+ /**
+ * The object's md5 hash should match the parameter md5.
+ *
+ *
+ * Not compatible with {@link #ifMd5DoesntMatch(byte[])} or {@link #ifModifiedSince(DateTime)}
+ *
+ * @param md5
+ * hash representing the entity
+ * @throws UnsupportedEncodingException
+ * if there was a problem converting this into an S3 eTag string
+ */
+ public GetObjectOptions ifMd5Matches(byte[] md5) throws UnsupportedEncodingException {
+ checkArgument(getIfNoneMatch() == null,
+ "ifMd5DoesntMatch() is not compatible with ifMd5Matches()");
+ checkArgument(getIfModifiedSince() == null,
+ "ifModifiedSince() is not compatible with ifMd5Matches()");
+ this.headers.put(HttpHeaders.IF_MATCH, String.format("\"%1$s\"", S3Utils
+ .toHexString(checkNotNull(md5, "md5"))));
+ return this;
+ }
- /**
- * For use in the request header: If-Match
- *
- * Return the object only if its entity tag (ETag) is the same as the md5
- * specified, otherwise return a 412 (precondition failed).
- *
- * @see GetObjectOptions#ifMd5Matches(byte[])
- */
- public String getIfMatch() {
- return this.getFirstHeaderOrNull(HttpHeaders.IF_MATCH);
- }
+ /**
+ * For use in the request header: If-Match
+ *
+ * Return the object only if its entity tag (ETag) is the same as the md5 specified, otherwise
+ * return a 412 (precondition failed).
+ *
+ * @see GetObjectOptions#ifMd5Matches(byte[])
+ */
+ public String getIfMatch() {
+ return this.getFirstHeaderOrNull(HttpHeaders.IF_MATCH);
+ }
- /**
- * The object should not have a md5 hash corresponding with the parameter
- * md5.
- *
- * Not compatible with {@link #ifMd5Matches(byte[])} or
- * {@link #ifUnmodifiedSince(DateTime)}
- *
- * @param md5
- * hash representing the entity
- * @throws UnsupportedEncodingException
- * if there was a problem converting this into an S3 eTag string
- */
- public GetObjectOptions ifMd5DoesntMatch(byte[] md5)
- throws UnsupportedEncodingException {
- checkArgument(getIfMatch() == null,
- "ifMd5Matches() is not compatible with ifMd5DoesntMatch()");
- checkArgument(getIfUnmodifiedSince() == null,
- "ifUnmodifiedSince() is not compatible with ifMd5DoesntMatch()");
- this.headers.put(HttpHeaders.IF_NONE_MATCH, String.format("\"%1$s\"",
- S3Utils.toHexString(checkNotNull(md5, "ifMd5DoesntMatch"))));
- return this;
- }
+ /**
+ * The object should not have a md5 hash corresponding with the parameter md5.
+ *
+ * Not compatible with {@link #ifMd5Matches(byte[])} or {@link #ifUnmodifiedSince(DateTime)}
+ *
+ * @param md5
+ * hash representing the entity
+ * @throws UnsupportedEncodingException
+ * if there was a problem converting this into an S3 eTag string
+ */
+ public GetObjectOptions ifMd5DoesntMatch(byte[] md5) throws UnsupportedEncodingException {
+ checkArgument(getIfMatch() == null,
+ "ifMd5Matches() is not compatible with ifMd5DoesntMatch()");
+ checkArgument(getIfUnmodifiedSince() == null,
+ "ifUnmodifiedSince() is not compatible with ifMd5DoesntMatch()");
+ this.headers.put(HttpHeaders.IF_NONE_MATCH, String.format("\"%1$s\"", S3Utils
+ .toHexString(checkNotNull(md5, "ifMd5DoesntMatch"))));
+ return this;
+ }
- /**
- * For use in the request header: If-None-Match
- *
- * Return the object only if its entity tag (ETag) is different from the one
- * specified, otherwise return a 304 (not modified).
- *
- * @see GetObjectOptions#ifMd5DoesntMatch(byte[])
- */
- public String getIfNoneMatch() {
- return this
- .getFirstHeaderOrNull(org.jclouds.http.HttpHeaders.IF_NONE_MATCH);
- }
+ /**
+ * For use in the request header: If-None-Match
+ *
+ * Return the object only if its entity tag (ETag) is different from the one specified, otherwise
+ * return a 304 (not modified).
+ *
+ * @see GetObjectOptions#ifMd5DoesntMatch(byte[])
+ */
+ public String getIfNoneMatch() {
+ return this.getFirstHeaderOrNull(org.jclouds.http.HttpHeaders.IF_NONE_MATCH);
+ }
- public static class Builder {
+ public static class Builder {
- /**
- * @see GetObjectOptions#range(long, long)
- */
- public static GetObjectOptions range(long start, long end) {
- GetObjectOptions options = new GetObjectOptions();
- return options.range(start, end);
- }
+ /**
+ * @see GetObjectOptions#range(long, long)
+ */
+ public static GetObjectOptions range(long start, long end) {
+ GetObjectOptions options = new GetObjectOptions();
+ return options.range(start, end);
+ }
- /**
- * @see GetObjectOptions#startAt(long)
- */
- public static GetObjectOptions startAt(long start) {
- GetObjectOptions options = new GetObjectOptions();
- return options.startAt(start);
- }
+ /**
+ * @see GetObjectOptions#startAt(long)
+ */
+ public static GetObjectOptions startAt(long start) {
+ GetObjectOptions options = new GetObjectOptions();
+ return options.startAt(start);
+ }
- /**
- * @see GetObjectOptions#tail(long)
- */
- public static GetObjectOptions tail(long count) {
- GetObjectOptions options = new GetObjectOptions();
- return options.tail(count);
- }
+ /**
+ * @see GetObjectOptions#tail(long)
+ */
+ public static GetObjectOptions tail(long count) {
+ GetObjectOptions options = new GetObjectOptions();
+ return options.tail(count);
+ }
- /**
- * @see GetObjectOptions#getIfModifiedSince()
- */
- public static GetObjectOptions ifModifiedSince(DateTime ifModifiedSince) {
- GetObjectOptions options = new GetObjectOptions();
- return options.ifModifiedSince(ifModifiedSince);
- }
+ /**
+ * @see GetObjectOptions#getIfModifiedSince()
+ */
+ public static GetObjectOptions ifModifiedSince(DateTime ifModifiedSince) {
+ GetObjectOptions options = new GetObjectOptions();
+ return options.ifModifiedSince(ifModifiedSince);
+ }
- /**
- * @see GetObjectOptions#ifUnmodifiedSince(DateTime)
- */
- public static GetObjectOptions ifUnmodifiedSince(
- DateTime ifUnmodifiedSince) {
- GetObjectOptions options = new GetObjectOptions();
- return options.ifUnmodifiedSince(ifUnmodifiedSince);
- }
+ /**
+ * @see GetObjectOptions#ifUnmodifiedSince(DateTime)
+ */
+ public static GetObjectOptions ifUnmodifiedSince(DateTime ifUnmodifiedSince) {
+ GetObjectOptions options = new GetObjectOptions();
+ return options.ifUnmodifiedSince(ifUnmodifiedSince);
+ }
- /**
- * @see GetObjectOptions#ifMd5Matches(byte[])
- */
- public static GetObjectOptions ifMd5Matches(byte[] md5)
- throws UnsupportedEncodingException {
- GetObjectOptions options = new GetObjectOptions();
- return options.ifMd5Matches(md5);
- }
+ /**
+ * @see GetObjectOptions#ifMd5Matches(byte[])
+ */
+ public static GetObjectOptions ifMd5Matches(byte[] md5) throws UnsupportedEncodingException {
+ GetObjectOptions options = new GetObjectOptions();
+ return options.ifMd5Matches(md5);
+ }
- /**
- * @see GetObjectOptions#ifMd5DoesntMatch(byte[])
- */
- public static GetObjectOptions ifMd5DoesntMatch(byte[] md5)
- throws UnsupportedEncodingException {
- GetObjectOptions options = new GetObjectOptions();
- return options.ifMd5DoesntMatch(md5);
- }
+ /**
+ * @see GetObjectOptions#ifMd5DoesntMatch(byte[])
+ */
+ public static GetObjectOptions ifMd5DoesntMatch(byte[] md5)
+ throws UnsupportedEncodingException {
+ GetObjectOptions options = new GetObjectOptions();
+ return options.ifMd5DoesntMatch(md5);
+ }
- }
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/ListBucketOptions.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/ListBucketOptions.java
index c4d1ee3399..656308ffdb 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/ListBucketOptions.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/commands/options/ListBucketOptions.java
@@ -59,7 +59,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
*/
public ListBucketOptions withPrefix(String prefix)
throws UnsupportedEncodingException {
- options.put("prefix", URLEncoder.encode(checkNotNull(prefix, "prefix"),
+ parameters.put("prefix", URLEncoder.encode(checkNotNull(prefix, "prefix"),
"UTF-8"));
return this;
}
@@ -68,7 +68,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
* @see ListBucketOptions#withPrefix(String)
*/
public String getPrefix() {
- return options.get("prefix");
+ return parameters.get("prefix");
}
/**
@@ -81,7 +81,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
*/
public ListBucketOptions afterMarker(String marker)
throws UnsupportedEncodingException {
- options.put("marker", URLEncoder.encode(checkNotNull(marker, "marker"),
+ parameters.put("marker", URLEncoder.encode(checkNotNull(marker, "marker"),
"UTF-8"));
return this;
}
@@ -90,7 +90,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
* @see ListBucketOptions#afterMarker(String)
*/
public String getMarker() {
- return options.get("marker");
+ return parameters.get("marker");
}
/**
@@ -99,7 +99,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
*/
public ListBucketOptions maxResults(long maxKeys) {
checkState(maxKeys >= 0, "maxKeys must be >= 0");
- options.put("max-keys", Long.toString(maxKeys));
+ parameters.put("max-keys", Long.toString(maxKeys));
return this;
}
@@ -107,7 +107,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
* @see ListBucketOptions#maxResults(long)
*/
public String getMaxKeys() {
- return options.get("max-keys");
+ return parameters.get("max-keys");
}
/**
@@ -120,7 +120,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
*/
public ListBucketOptions delimiter(String delimiter)
throws UnsupportedEncodingException {
- options.put("delimiter", URLEncoder.encode(checkNotNull(delimiter,
+ parameters.put("delimiter", URLEncoder.encode(checkNotNull(delimiter,
"delimiter"), "UTF-8"));
return this;
}
@@ -129,7 +129,7 @@ public class ListBucketOptions extends BaseHttpRequestOptions {
* @see ListBucketOptions#delimiter(String)
*/
public String getDelimiter() {
- return options.get("delimiter");
+ return parameters.get("delimiter");
}
public static class Builder {
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/LiveS3ConnectionModule.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/LiveS3ConnectionModule.java
index a8ea7adfe1..f0175ef155 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/LiveS3ConnectionModule.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/LiveS3ConnectionModule.java
@@ -23,18 +23,15 @@
*/
package org.jclouds.aws.s3.config;
-import com.google.inject.*;
-import com.google.inject.assistedinject.FactoryProvider;
-import com.google.inject.name.Named;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Resource;
+
import org.jclouds.aws.s3.S3Connection;
-import org.jclouds.aws.s3.S3Context;
-import org.jclouds.aws.s3.commands.config.S3CommandsModule;
import org.jclouds.aws.s3.filters.RequestAuthorizeSignature;
import org.jclouds.aws.s3.handlers.ParseS3ErrorFromXmlContent;
-import org.jclouds.aws.s3.internal.GuiceS3Context;
import org.jclouds.aws.s3.internal.LiveS3Connection;
-import org.jclouds.aws.s3.internal.LiveS3InputStreamMap;
-import org.jclouds.aws.s3.internal.LiveS3ObjectMap;
import org.jclouds.http.HttpConstants;
import org.jclouds.http.HttpRequestFilter;
import org.jclouds.http.HttpResponseHandler;
@@ -44,53 +41,52 @@ import org.jclouds.http.annotation.ServerErrorHandler;
import org.jclouds.http.handlers.CloseContentAndSetExceptionHandler;
import org.jclouds.logging.Logger;
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
+import com.google.inject.AbstractModule;
+import com.google.inject.Inject;
+import com.google.inject.Provides;
+import com.google.inject.Scopes;
+import com.google.inject.Singleton;
+import com.google.inject.name.Named;
/**
* Configures the S3 connection, including logging and http transport.
- *
+ *
* @author Adrian Cole
*/
@S3ConnectionModule
public class LiveS3ConnectionModule extends AbstractModule {
- @Resource
- protected Logger logger = Logger.NULL;
+ @Resource
+ protected Logger logger = Logger.NULL;
- @Inject
- @Named(HttpConstants.PROPERTY_HTTP_ADDRESS)
- String address;
- @Inject
- @Named(HttpConstants.PROPERTY_HTTP_PORT)
- int port;
- @Inject
- @Named(HttpConstants.PROPERTY_HTTP_SECURE)
- boolean isSecure;
+ @Inject
+ @Named(HttpConstants.PROPERTY_HTTP_ADDRESS)
+ String address;
+ @Inject
+ @Named(HttpConstants.PROPERTY_HTTP_PORT)
+ int port;
+ @Inject
+ @Named(HttpConstants.PROPERTY_HTTP_SECURE)
+ boolean isSecure;
- @Override
- protected void configure() {
- bind(S3Connection.class).to(LiveS3Connection.class)
- .in(Scopes.SINGLETON);
- bind(HttpResponseHandler.class).annotatedWith(RedirectHandler.class)
- .to(CloseContentAndSetExceptionHandler.class).in(
- Scopes.SINGLETON);
- bind(HttpResponseHandler.class).annotatedWith(ClientErrorHandler.class)
- .to(ParseS3ErrorFromXmlContent.class).in(Scopes.SINGLETON);
- bind(HttpResponseHandler.class).annotatedWith(ServerErrorHandler.class)
- .to(ParseS3ErrorFromXmlContent.class).in(Scopes.SINGLETON);
- requestInjection(this);
- logger.info("S3 Context = %1$s://%2$s:%3$s", (isSecure ? "https"
- : "http"), address, port);
- }
+ @Override
+ protected void configure() {
+ bind(S3Connection.class).to(LiveS3Connection.class).in(Scopes.SINGLETON);
+ bind(HttpResponseHandler.class).annotatedWith(RedirectHandler.class).to(
+ CloseContentAndSetExceptionHandler.class).in(Scopes.SINGLETON);
+ bind(HttpResponseHandler.class).annotatedWith(ClientErrorHandler.class).to(
+ ParseS3ErrorFromXmlContent.class).in(Scopes.SINGLETON);
+ bind(HttpResponseHandler.class).annotatedWith(ServerErrorHandler.class).to(
+ ParseS3ErrorFromXmlContent.class).in(Scopes.SINGLETON);
+ requestInjection(this);
+ logger.info("S3 Context = %1$s://%2$s:%3$s", (isSecure ? "https" : "http"), address, port);
+ }
- @Provides
- @Singleton
- List provideRequestFilters(
- RequestAuthorizeSignature requestAuthorizeSignature) {
- List filters = new ArrayList();
- filters.add(requestAuthorizeSignature);
- return filters;
- }
+ @Provides
+ @Singleton
+ List provideRequestFilters(RequestAuthorizeSignature requestAuthorizeSignature) {
+ List filters = new ArrayList();
+ filters.add(requestAuthorizeSignature);
+ return filters;
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ConnectionModule.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ConnectionModule.java
index 5cccf024d1..0483ee8c67 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ConnectionModule.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ConnectionModule.java
@@ -6,13 +6,11 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import org.jclouds.http.HttpFutureCommandClient;
-
/**
* designates the the module configures a {@link org.jclouds.aws.s3.S3Connection}
- *
+ *
* @author Adrian Cole
- *
+ *
*/
@Retention(RUNTIME)
@Target(TYPE)
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java
index b158233e5b..e553d4f91e 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/config/S3ContextModule.java
@@ -23,8 +23,6 @@
*/
package org.jclouds.aws.s3.config;
-import com.google.inject.AbstractModule;
-import com.google.inject.assistedinject.FactoryProvider;
import org.jclouds.aws.s3.S3Connection;
import org.jclouds.aws.s3.S3Context;
import org.jclouds.aws.s3.commands.config.S3CommandsModule;
@@ -32,28 +30,28 @@ import org.jclouds.aws.s3.internal.GuiceS3Context;
import org.jclouds.aws.s3.internal.LiveS3InputStreamMap;
import org.jclouds.aws.s3.internal.LiveS3ObjectMap;
+import com.google.inject.AbstractModule;
+import com.google.inject.assistedinject.FactoryProvider;
+
/**
* Configures the {@link S3Context}; requires {@link S3Connection} bound.
- *
+ *
* @author Adrian Cole
*/
public class S3ContextModule extends AbstractModule {
-
- @Override
- protected void configure() {
- this.requireBinding(S3Connection.class);
- install(new S3CommandsModule());
- bind(GuiceS3Context.S3ObjectMapFactory.class).toProvider(
- FactoryProvider.newFactory(
- GuiceS3Context.S3ObjectMapFactory.class,
+ @Override
+ protected void configure() {
+ this.requireBinding(S3Connection.class);
+ install(new S3CommandsModule());
+ bind(GuiceS3Context.S3ObjectMapFactory.class).toProvider(
+ FactoryProvider.newFactory(GuiceS3Context.S3ObjectMapFactory.class,
LiveS3ObjectMap.class));
- bind(GuiceS3Context.S3InputStreamMapFactory.class).toProvider(
- FactoryProvider.newFactory(
- GuiceS3Context.S3InputStreamMapFactory.class,
+ bind(GuiceS3Context.S3InputStreamMapFactory.class).toProvider(
+ FactoryProvider.newFactory(GuiceS3Context.S3InputStreamMapFactory.class,
LiveS3InputStreamMap.class));
- bind(S3Context.class).to(GuiceS3Context.class);
+ bind(S3Context.class).to(GuiceS3Context.class);
- }
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java
index 05f5d55381..67a9d51663 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/filters/RequestAuthorizeSignature.java
@@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import org.jclouds.aws.s3.reference.S3Constants;
-import org.jclouds.aws.s3.util.DateService;
import org.jclouds.aws.s3.util.S3Utils;
+import org.jclouds.aws.util.DateService;
import org.jclouds.http.HttpException;
import org.jclouds.http.HttpHeaders;
import org.jclouds.http.HttpRequest;
@@ -43,150 +43,136 @@ import com.google.inject.name.Named;
/**
* Signs the S3 request. This will update timestamps at most once per second.
*
- * @see
+ * @see
* @author Adrian Cole
*
*/
public class RequestAuthorizeSignature implements HttpRequestFilter {
- private static final String[] firstHeadersToSign = new String[] {
- HttpHeaders.CONTENT_MD5, HttpHeaders.CONTENT_TYPE, HttpHeaders.DATE };
+ private static final String[] firstHeadersToSign = new String[] { HttpHeaders.CONTENT_MD5,
+ HttpHeaders.CONTENT_TYPE, HttpHeaders.DATE };
- private final String accessKey;
- private final String secretKey;
- private final DateService dateService;
+ private final String accessKey;
+ private final String secretKey;
+ private final DateService dateService;
- public static final long BILLION = 1000000000;
- private final AtomicReference timeStamp;
- private final AtomicLong trigger = new AtomicLong(System.nanoTime() + 1
- * BILLION);
+ public static final long BILLION = 1000000000;
+ private final AtomicReference timeStamp;
+ private final AtomicLong trigger = new AtomicLong(System.nanoTime() + 1 * BILLION);
- /**
- * Start the time update service. Amazon clocks need to be within 900
- * seconds of the request time. This method updates the clock every second.
- * This is not performed per-request, as creation of the date object is a
- * slow, synchronized command.
- */
- synchronized void updateIfTimeOut() {
+ /**
+ * Start the time update service. Amazon clocks need to be within 900 seconds of the request
+ * time. This method updates the clock every second. This is not performed per-request, as
+ * creation of the date object is a slow, synchronized command.
+ */
+ synchronized void updateIfTimeOut() {
- if (trigger.get() - System.nanoTime() <= 0) {
- timeStamp.set(createNewStamp());
- trigger.set(System.nanoTime() + 1 * BILLION);
- }
+ if (trigger.get() - System.nanoTime() <= 0) {
+ timeStamp.set(createNewStamp());
+ trigger.set(System.nanoTime() + 1 * BILLION);
+ }
- }
+ }
- // this is a hotspot when submitted concurrently, so be lazy.
- // amazon is ok with up to 15 minutes off their time, so let's
- // be as lazy as possible.
- String createNewStamp() {
- return dateService.rfc822DateFormat();
- }
+ // this is a hotspot when submitted concurrently, so be lazy.
+ // amazon is ok with up to 15 minutes off their time, so let's
+ // be as lazy as possible.
+ String createNewStamp() {
+ return dateService.rfc822DateFormat();
+ }
- public String timestampAsHeaderString() {
- updateIfTimeOut();
- return timeStamp.get();
- }
+ public String timestampAsHeaderString() {
+ updateIfTimeOut();
+ return timeStamp.get();
+ }
- @Inject
- public RequestAuthorizeSignature(
- @Named(S3Constants.PROPERTY_AWS_ACCESSKEYID) String accessKey,
- @Named(S3Constants.PROPERTY_AWS_SECRETACCESSKEY) String secretKey,
- DateService dateService) {
- this.accessKey = accessKey;
- this.secretKey = secretKey;
- this.dateService = dateService;
- timeStamp = new AtomicReference(createNewStamp());
- }
+ @Inject
+ public RequestAuthorizeSignature(@Named(S3Constants.PROPERTY_AWS_ACCESSKEYID) String accessKey,
+ @Named(S3Constants.PROPERTY_AWS_SECRETACCESSKEY) String secretKey,
+ DateService dateService) {
+ this.accessKey = accessKey;
+ this.secretKey = secretKey;
+ this.dateService = dateService;
+ timeStamp = new AtomicReference(createNewStamp());
+ }
- public void filter(HttpRequest request) throws HttpException {
- // re-sign the request
- removeOldHeaders(request);
+ public void filter(HttpRequest request) throws HttpException {
+ // re-sign the request
+ removeOldHeaders(request);
- addDateHeader(request);
+ addDateHeader(request);
- String toSign = createStringToSign(request);
+ String toSign = createStringToSign(request);
- addAuthHeader(request, toSign);
- }
+ addAuthHeader(request, toSign);
+ }
- public static String createStringToSign(HttpRequest request) {
- StringBuilder buffer = new StringBuilder();
- appendMethod(request, buffer);
- appendHttpHeaders(request, buffer);
- appendAmzHeaders(request, buffer);
- appendBucketName(request, buffer);
- appendUriPath(request, buffer);
- return buffer.toString();
- }
+ public static String createStringToSign(HttpRequest request) {
+ StringBuilder buffer = new StringBuilder();
+ appendMethod(request, buffer);
+ appendHttpHeaders(request, buffer);
+ appendAmzHeaders(request, buffer);
+ appendBucketName(request, buffer);
+ appendUriPath(request, buffer);
+ return buffer.toString();
+ }
- private void removeOldHeaders(HttpRequest request) {
- request.getHeaders().removeAll(S3Constants.AUTHORIZATION);
- request.getHeaders().removeAll(HttpHeaders.CONTENT_TYPE);
- request.getHeaders().removeAll(HttpHeaders.DATE);
- }
+ private void removeOldHeaders(HttpRequest request) {
+ request.getHeaders().removeAll(S3Constants.AUTHORIZATION);
+ request.getHeaders().removeAll(HttpHeaders.CONTENT_TYPE);
+ request.getHeaders().removeAll(HttpHeaders.DATE);
+ }
- private void addAuthHeader(HttpRequest request, String toSign)
- throws HttpException {
- String signature;
- try {
- signature = S3Utils.hmacSha1Base64(toSign, secretKey.getBytes());
- } catch (Exception e) {
- throw new HttpException("error signing request", e);
- }
- request.getHeaders().put(S3Constants.AUTHORIZATION,
- "AWS " + accessKey + ":" + signature);
- }
+ private void addAuthHeader(HttpRequest request, String toSign) throws HttpException {
+ String signature;
+ try {
+ signature = S3Utils.hmacSha1Base64(toSign, secretKey.getBytes());
+ } catch (Exception e) {
+ throw new HttpException("error signing request", e);
+ }
+ request.getHeaders().put(S3Constants.AUTHORIZATION, "AWS " + accessKey + ":" + signature);
+ }
- private static void appendMethod(HttpRequest request, StringBuilder toSign) {
- toSign.append(request.getMethod()).append("\n");
- }
+ private static void appendMethod(HttpRequest request, StringBuilder toSign) {
+ toSign.append(request.getMethod()).append("\n");
+ }
- private void addDateHeader(HttpRequest request) {
- request.getHeaders().put(HttpHeaders.DATE, timestampAsHeaderString());
- }
+ private void addDateHeader(HttpRequest request) {
+ request.getHeaders().put(HttpHeaders.DATE, timestampAsHeaderString());
+ }
- private static void appendAmzHeaders(HttpRequest request,
- StringBuilder toSign) {
- Set headers = new TreeSet(request.getHeaders().keySet());
- for (String header : headers) {
- if (header.startsWith("x-amz-")) {
- toSign.append(header).append(":");
- for (String value : request.getHeaders().get(header))
- toSign.append(value.replaceAll("\r?\n", "")).append(",");
- toSign.deleteCharAt(toSign.lastIndexOf(","));
- toSign.append("\n");
- }
- }
- }
+ private static void appendAmzHeaders(HttpRequest request, StringBuilder toSign) {
+ Set headers = new TreeSet(request.getHeaders().keySet());
+ for (String header : headers) {
+ if (header.startsWith("x-amz-")) {
+ toSign.append(header).append(":");
+ for (String value : request.getHeaders().get(header))
+ toSign.append(value.replaceAll("\r?\n", "")).append(",");
+ toSign.deleteCharAt(toSign.lastIndexOf(","));
+ toSign.append("\n");
+ }
+ }
+ }
- private static void appendHttpHeaders(HttpRequest request,
- StringBuilder toSign) {
- for (String header : firstHeadersToSign)
- toSign.append(valueOrEmpty(request.getHeaders().get(header)))
- .append("\n");
- }
+ private static void appendHttpHeaders(HttpRequest request, StringBuilder toSign) {
+ for (String header : firstHeadersToSign)
+ toSign.append(valueOrEmpty(request.getHeaders().get(header))).append("\n");
+ }
- private static void appendBucketName(HttpRequest request,
- StringBuilder toSign) {
- String hostHeader = request.getHeaders().get(HttpHeaders.HOST)
- .iterator().next();
- if (hostHeader.endsWith(".s3.amazonaws.com"))
- toSign.append("/").append(
- hostHeader.substring(0, hostHeader.length() - 17));
- }
+ private static void appendBucketName(HttpRequest request, StringBuilder toSign) {
+ String hostHeader = request.getHeaders().get(HttpHeaders.HOST).iterator().next();
+ if (hostHeader.endsWith(".s3.amazonaws.com"))
+ toSign.append("/").append(hostHeader.substring(0, hostHeader.length() - 17));
+ }
- private static void appendUriPath(HttpRequest request, StringBuilder toSign) {
- int queryIndex = request.getUri().indexOf('?');
- if (queryIndex >= 0)
- toSign.append(request.getUri().substring(0, queryIndex));
- else
- toSign.append(request.getUri());
- }
+ private static void appendUriPath(HttpRequest request, StringBuilder toSign) {
+ int queryIndex = request.getUri().indexOf('?');
+ if (queryIndex >= 0)
+ toSign.append(request.getUri().substring(0, queryIndex));
+ else
+ toSign.append(request.getUri());
+ }
- private static String valueOrEmpty(Collection collection) {
- return (collection != null && collection.size() >= 1) ? collection
- .iterator().next() : "";
- }
+ private static String valueOrEmpty(Collection collection) {
+ return (collection != null && collection.size() >= 1) ? collection.iterator().next() : "";
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
index 8cf0e427b2..ea818dbedc 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/GuiceS3Context.java
@@ -23,8 +23,10 @@
*/
package org.jclouds.aws.s3.internal;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
+import java.io.IOException;
+
+import javax.annotation.Resource;
+
import org.jclouds.aws.s3.S3Connection;
import org.jclouds.aws.s3.S3Context;
import org.jclouds.aws.s3.S3InputStreamMap;
@@ -32,75 +34,74 @@ import org.jclouds.aws.s3.S3ObjectMap;
import org.jclouds.lifecycle.Closer;
import org.jclouds.logging.Logger;
-import javax.annotation.Resource;
-import java.io.IOException;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
/**
* Uses a Guice Injector to configure the objects served by S3Context methods.
- *
+ *
* @author Adrian Cole
* @see Injector
*/
public class GuiceS3Context implements S3Context {
- public interface S3ObjectMapFactory {
- S3ObjectMap createMapView(String bucket);
- }
+ public interface S3ObjectMapFactory {
+ S3ObjectMap createMapView(String bucket);
+ }
- public interface S3InputStreamMapFactory {
- S3InputStreamMap createMapView(String bucket);
- }
+ public interface S3InputStreamMapFactory {
+ S3InputStreamMap createMapView(String bucket);
+ }
- @Resource
- private Logger logger = Logger.NULL;
- private final Injector injector;
- private final S3InputStreamMapFactory s3InputStreamMapFactory;
- private final S3ObjectMapFactory s3ObjectMapFactory;
- private final Closer closer;
+ @Resource
+ private Logger logger = Logger.NULL;
+ private final Injector injector;
+ private final S3InputStreamMapFactory s3InputStreamMapFactory;
+ private final S3ObjectMapFactory s3ObjectMapFactory;
+ private final Closer closer;
- @Inject
- private GuiceS3Context(Injector injector, Closer closer,
- S3ObjectMapFactory s3ObjectMapFactory,
- S3InputStreamMapFactory s3InputStreamMapFactory) {
- this.injector = injector;
- this.s3InputStreamMapFactory = s3InputStreamMapFactory;
- this.s3ObjectMapFactory = s3ObjectMapFactory;
- this.closer = closer;
- }
+ @Inject
+ private GuiceS3Context(Injector injector, Closer closer, S3ObjectMapFactory s3ObjectMapFactory,
+ S3InputStreamMapFactory s3InputStreamMapFactory) {
+ this.injector = injector;
+ this.s3InputStreamMapFactory = s3InputStreamMapFactory;
+ this.s3ObjectMapFactory = s3ObjectMapFactory;
+ this.closer = closer;
+ }
- /**
- * {@inheritDoc}
- */
- public S3Connection getConnection() {
- return injector.getInstance(S3Connection.class);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public S3Connection getConnection() {
+ return injector.getInstance(S3Connection.class);
+ }
- /**
- * {@inheritDoc}
- */
- public S3InputStreamMap createInputStreamMap(String bucket) {
- getConnection().putBucketIfNotExists(bucket);
- return s3InputStreamMapFactory.createMapView(bucket);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public S3InputStreamMap createInputStreamMap(String bucket) {
+ getConnection().putBucketIfNotExists(bucket);
+ return s3InputStreamMapFactory.createMapView(bucket);
+ }
- /**
- * {@inheritDoc}
- */
- public S3ObjectMap createS3ObjectMap(String bucket) {
- getConnection().putBucketIfNotExists(bucket);
- return s3ObjectMapFactory.createMapView(bucket);
- }
+ /**
+ * {@inheritDoc}
+ */
+ public S3ObjectMap createS3ObjectMap(String bucket) {
+ getConnection().putBucketIfNotExists(bucket);
+ return s3ObjectMapFactory.createMapView(bucket);
+ }
- /**
- * {@inheritDoc}
- *
- * @see Closer
- */
- public void close() {
- try {
- closer.close();
- } catch (IOException e) {
- logger.error(e, "error closing content");
- }
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see Closer
+ */
+ public void close() {
+ try {
+ closer.close();
+ } catch (IOException e) {
+ logger.error(e, "error closing content");
+ }
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java
index 8a28fb2ceb..e54c07d31d 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/internal/LiveS3Connection.java
@@ -53,191 +53,180 @@ import com.google.inject.Inject;
/**
* Uses {@link HttpFutureCommandClient} to invoke the REST API of S3.
*
- * @see
+ * @see
* @author Adrian Cole
*/
public class LiveS3Connection implements S3Connection {
- private final HttpFutureCommandClient client;
- /**
- * creates command objects that can be submitted to the client
- */
- private final S3CommandFactory factory;
+ private final HttpFutureCommandClient client;
+ /**
+ * creates command objects that can be submitted to the client
+ */
+ private final S3CommandFactory factory;
- @Inject
- public LiveS3Connection(HttpFutureCommandClient client,
- S3CommandFactory factory) {
- this.client = client;
- this.factory = factory;
- }
+ @Inject
+ public LiveS3Connection(HttpFutureCommandClient client, S3CommandFactory factory) {
+ this.client = client;
+ this.factory = factory;
+ }
- /**
- * {@inheritDoc}
- *
- * @see GetObject
- */
- public Future getObject(String s3Bucket, String key) {
- return getObject(s3Bucket, key, GetObjectOptions.NONE);
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see GetObject
+ */
+ public Future getObject(String s3Bucket, String key) {
+ return getObject(s3Bucket, key, GetObjectOptions.NONE);
+ }
- /**
- * {@inheritDoc}
- *
- * @see GetObject
- */
- public Future getObject(String s3Bucket, String key,
- GetObjectOptions options) {
- GetObject getObject = factory.createGetObject(s3Bucket, key, options);
- client.submit(getObject);
- return getObject;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see GetObject
+ */
+ public Future getObject(String s3Bucket, String key, GetObjectOptions options) {
+ GetObject getObject = factory.createGetObject(s3Bucket, key, options);
+ client.submit(getObject);
+ return getObject;
+ }
- /**
- * {@inheritDoc}
- *
- * @see HeadObject
- */
- public Future headObject(String s3Bucket, String key) {
- HeadObject headMetadata = factory.createHeadMetadata(s3Bucket, key);
- client.submit(headMetadata);
- return headMetadata;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see HeadObject
+ */
+ public Future headObject(String s3Bucket, String key) {
+ HeadObject headMetadata = factory.createHeadMetadata(s3Bucket, key);
+ client.submit(headMetadata);
+ return headMetadata;
+ }
- /**
- * {@inheritDoc}
- *
- * @see DeleteObject
- */
- public Future deleteObject(String s3Bucket, String key) {
- DeleteObject deleteObject = factory.createDeleteObject(s3Bucket, key);
- client.submit(deleteObject);
- return deleteObject;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see DeleteObject
+ */
+ public Future deleteObject(String s3Bucket, String key) {
+ DeleteObject deleteObject = factory.createDeleteObject(s3Bucket, key);
+ client.submit(deleteObject);
+ return deleteObject;
+ }
- /**
- * {@inheritDoc}
- *
- * @see PutObject
- */
- public Future putObject(String s3Bucket, S3Object object) {
- return putObject(s3Bucket, object, PutObjectOptions.NONE);
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see PutObject
+ */
+ public Future putObject(String s3Bucket, S3Object object) {
+ return putObject(s3Bucket, object, PutObjectOptions.NONE);
+ }
- /**
- * {@inheritDoc}
- *
- * @see PutObject
- */
- public Future putObject(String bucketName, S3Object object,
- PutObjectOptions options) {
- PutObject putObject = factory.createPutObject(bucketName, object,
- options);
- client.submit(putObject);
- return putObject;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see PutObject
+ */
+ public Future putObject(String bucketName, S3Object object, PutObjectOptions options) {
+ PutObject putObject = factory.createPutObject(bucketName, object, options);
+ client.submit(putObject);
+ return putObject;
+ }
- /**
- * {@inheritDoc}
- *
- * @see PutBucket
- */
- public Future putBucketIfNotExists(String s3Bucket) {
- return putBucketIfNotExists(s3Bucket, PutBucketOptions.NONE);
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see PutBucket
+ */
+ public Future putBucketIfNotExists(String s3Bucket) {
+ return putBucketIfNotExists(s3Bucket, PutBucketOptions.NONE);
+ }
- /**
- * {@inheritDoc}
- *
- * @see PutBucket
- */
- public Future putBucketIfNotExists(String s3Bucket,
- PutBucketOptions options) {
- PutBucket putBucket = factory.createPutBucket(s3Bucket, options);
- client.submit(putBucket);
- return putBucket;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see PutBucket
+ */
+ public Future putBucketIfNotExists(String s3Bucket, PutBucketOptions options) {
+ PutBucket putBucket = factory.createPutBucket(s3Bucket, options);
+ client.submit(putBucket);
+ return putBucket;
+ }
- /**
- * {@inheritDoc}
- *
- * @see DeleteBucket
- */
- public Future deleteBucketIfEmpty(String s3Bucket) {
- DeleteBucket deleteBucket = factory.createDeleteBucket(s3Bucket);
- client.submit(deleteBucket);
- return deleteBucket;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see DeleteBucket
+ */
+ public Future deleteBucketIfEmpty(String s3Bucket) {
+ DeleteBucket deleteBucket = factory.createDeleteBucket(s3Bucket);
+ client.submit(deleteBucket);
+ return deleteBucket;
+ }
- /**
- * {@inheritDoc}
- *
- * @see CopyObject
- */
- public Future copyObject(String sourceBucket,
- String sourceObject, String destinationBucket,
- String destinationObject) {
- return copyObject(sourceBucket, sourceObject, destinationBucket,
- destinationObject, new CopyObjectOptions());
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see CopyObject
+ */
+ public Future copyObject(String sourceBucket, String sourceObject,
+ String destinationBucket, String destinationObject) {
+ return copyObject(sourceBucket, sourceObject, destinationBucket, destinationObject,
+ new CopyObjectOptions());
+ }
- /**
- * {@inheritDoc}
- *
- * @see CopyObject
- */
- public Future copyObject(String sourceBucket,
- String sourceObject, String destinationBucket,
- String destinationObject, CopyObjectOptions options) {
- CopyObject copy = factory.createCopyObject(sourceBucket, sourceObject,
- destinationBucket, destinationObject, options);
- client.submit(copy);
- return copy;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see CopyObject
+ */
+ public Future copyObject(String sourceBucket, String sourceObject,
+ String destinationBucket, String destinationObject, CopyObjectOptions options) {
+ CopyObject copy = factory.createCopyObject(sourceBucket, sourceObject, destinationBucket,
+ destinationObject, options);
+ client.submit(copy);
+ return copy;
+ }
- /**
- * {@inheritDoc}
- *
- * @see BucketExists
- */
- public Future bucketExists(String s3Bucket) {
- BucketExists headRequestObject = factory.createHeadBucket(s3Bucket);
- client.submit(headRequestObject);
- return headRequestObject;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see BucketExists
+ */
+ public Future bucketExists(String s3Bucket) {
+ BucketExists headRequestObject = factory.createHeadBucket(s3Bucket);
+ client.submit(headRequestObject);
+ return headRequestObject;
+ }
- /**
- * {@inheritDoc}
- *
- * @see ListBucket
- */
- public Future listBucket(String s3Bucket) {
- return listBucket(s3Bucket, ListBucketOptions.NONE);
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see ListBucket
+ */
+ public Future listBucket(String s3Bucket) {
+ return listBucket(s3Bucket, ListBucketOptions.NONE);
+ }
- /**
- * {@inheritDoc}
- *
- * @see ListBucket
- */
- public Future listBucket(String s3Bucket,
- ListBucketOptions options) {
- ListBucket getBucket = factory.createListBucket(s3Bucket, options);
- client.submit(getBucket);
- return getBucket;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see ListBucket
+ */
+ public Future listBucket(String s3Bucket, ListBucketOptions options) {
+ ListBucket getBucket = factory.createListBucket(s3Bucket, options);
+ client.submit(getBucket);
+ return getBucket;
+ }
- /**
- * {@inheritDoc}
- *
- * @see ListOwnedBuckets
- */
- public Future> listOwnedBuckets() {
- ListOwnedBuckets listRequest = factory
- .createGetMetadataForOwnedBuckets();
- client.submit(listRequest);
- return listRequest;
- }
+ /**
+ * {@inheritDoc}
+ *
+ * @see ListOwnedBuckets
+ */
+ public Future> listOwnedBuckets() {
+ ListOwnedBuckets listRequest = factory.createGetMetadataForOwnedBuckets();
+ client.submit(listRequest);
+ return listRequest;
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java
index 0587e0c4be..2b0b333e08 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/util/S3Utils.java
@@ -28,218 +28,115 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
import org.bouncycastle.crypto.digests.MD5Digest;
-import org.bouncycastle.crypto.digests.SHA1Digest;
-import org.bouncycastle.crypto.macs.HMac;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.bouncycastle.util.encoders.Base64;
import org.jclouds.aws.s3.domain.S3Object;
-import org.jclouds.util.Utils;
+import org.jclouds.aws.util.AWSUtils;
import java.io.*;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
-import java.security.NoSuchProviderException;
-import java.util.regex.Pattern;
/**
- * Encryption, Hashing, and IO Utilities needed to sign and verify S3 requests
- * and responses.
- *
+ * Encryption, Hashing, and IO Utilities needed to sign and verify S3 requests and responses.
+ *
* @author Adrian Cole
*/
-public class S3Utils extends Utils {
+public class S3Utils extends AWSUtils {
- private static final Pattern IP_PATTERN = Pattern
- .compile("b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?).)"
- + "{3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)b");
+ public static String validateBucketName(String bucketName) {
+ checkNotNull(bucketName, "bucketName");
+ checkArgument(bucketName.matches("^[a-z0-9].*"),
+ "bucketName name must start with a number or letter");
+ checkArgument(
+ bucketName.matches("^[-_.a-z0-9]+"),
+ "bucketName name can only contain lowercase letters, numbers, periods (.), underscores (_), and dashes (-)");
+ checkArgument(bucketName.length() > 2 && bucketName.length() < 256,
+ "bucketName name must be between 3 and 255 characters long");
+ checkArgument(!IP_PATTERN.matcher(bucketName).matches(),
+ "bucketName name cannot be ip address style");
+ return bucketName;
+ }
- public static String validateBucketName(String bucketName) {
- checkNotNull(bucketName, "bucketName");
- checkArgument(bucketName.matches("^[a-z0-9].*"),
- "bucketName name must start with a number or letter");
- checkArgument(
- bucketName.matches("^[-_.a-z0-9]+"),
- "bucketName name can only contain lowercase letters, numbers, periods (.), underscores (_), and dashes (-)");
- checkArgument(bucketName.length() > 2 && bucketName.length() < 256,
- "bucketName name must be between 3 and 255 characters long");
- checkArgument(!IP_PATTERN.matcher(bucketName).matches(),
- "bucketName name cannot be ip address style");
- return bucketName;
- }
+ public static long calculateSize(Object data) {
+ long size = -1;
+ if (data instanceof byte[]) {
+ size = ((byte[]) data).length;
+ } else if (data instanceof String) {
+ size = ((String) data).length();
+ } else if (data instanceof File) {
+ size = ((File) data).length();
+ }
+ return size;
+ }
- static final byte[] HEX_CHAR_TABLE = {(byte) '0', (byte) '1', (byte) '2',
- (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7',
- (byte) '8', (byte) '9', (byte) 'a', (byte) 'b', (byte) 'c',
- (byte) 'd', (byte) 'e', (byte) 'f'};
+ /**
+ * @throws IOException
+ */
+ public static byte[] md5(Object data) throws IOException {
+ checkNotNull(data, "data must be set before calling generateMd5()");
+ byte[] md5 = null;
+ if (data == null) {
+ } else if (data instanceof byte[]) {
+ md5 = S3Utils.md5((byte[]) data);
+ } else if (data instanceof String) {
+ md5 = S3Utils.md5(((String) data).getBytes());
+ } else if (data instanceof File) {
+ md5 = S3Utils.md5(((File) data));
+ } else {
+ throw new UnsupportedOperationException("Content not supported " + data.getClass());
+ }
+ return md5;
- public static String toHexString(byte[] raw)
- throws UnsupportedEncodingException {
- byte[] hex = new byte[2 * raw.length];
- int index = 0;
-
- for (byte b : raw) {
- int v = b & 0xFF;
- hex[index++] = HEX_CHAR_TABLE[v >>> 4];
- hex[index++] = HEX_CHAR_TABLE[v & 0xF];
- }
- return new String(hex, "ASCII");
- }
-
- public static long calculateSize(Object data) {
- long size = -1;
- if (data instanceof byte[]) {
- size = ((byte[]) data).length;
- } else if (data instanceof String) {
- size = ((String) data).length();
- } else if (data instanceof File) {
- size = ((File) data).length();
- }
- return size;
- }
-
- /**
- * @throws IOException
- */
- public static byte[] md5(Object data) throws IOException {
- checkNotNull(data, "data must be set before calling generateMd5()");
- byte[] md5 = null;
- if (data == null) {
- } else if (data instanceof byte[]) {
- md5 = S3Utils.md5((byte[]) data);
- } else if (data instanceof String) {
- md5 = S3Utils.md5(((String) data).getBytes());
- } else if (data instanceof File) {
- md5 = S3Utils.md5(((File) data));
- } else {
- throw new UnsupportedOperationException("Content not supported "
- + data.getClass());
- }
- return md5;
-
- }
-
- public static byte[] fromHexString(String hex) {
- byte[] bytes = new byte[hex.length() / 2];
- for (int i = 0; i < bytes.length; i++) {
- bytes[i] = (byte) Integer.parseInt(hex.substring(2 * i, 2 * i + 2),
- 16);
- }
- return bytes;
- }
-
- public static String hmacSha1Base64(String toEncode, byte[] key)
- throws NoSuchAlgorithmException, NoSuchProviderException,
- InvalidKeyException {
- HMac hmac = new HMac(new SHA1Digest());
- byte[] resBuf = new byte[hmac.getMacSize()];
- byte[] plainBytes = toEncode.getBytes();
- byte[] keyBytes = key;
- hmac.init(new KeyParameter(keyBytes));
- hmac.update(plainBytes, 0, plainBytes.length);
- hmac.doFinal(resBuf, 0);
- return toBase64String(resBuf);
- }
-
- public static String md5Hex(byte[] toEncode)
- throws NoSuchAlgorithmException, NoSuchProviderException,
- InvalidKeyException, UnsupportedEncodingException {
- byte[] resBuf = md5(toEncode);
- return toHexString(resBuf);
- }
-
- public static String md5Base64(byte[] toEncode)
- throws NoSuchAlgorithmException, NoSuchProviderException,
- InvalidKeyException {
- byte[] resBuf = md5(toEncode);
- return toBase64String(resBuf);
- }
-
- public static String toBase64String(byte[] resBuf) {
- return new String(Base64.encode(resBuf));
- }
-
- public static byte[] md5(byte[] plainBytes) {
- MD5Digest md5 = new MD5Digest();
- byte[] resBuf = new byte[md5.getDigestSize()];
- md5.update(plainBytes, 0, plainBytes.length);
- md5.doFinal(resBuf, 0);
- return resBuf;
- }
-
- public static byte[] md5(File toEncode) throws IOException {
- MD5Digest md5 = new MD5Digest();
- byte[] resBuf = new byte[md5.getDigestSize()];
- byte[] buffer = new byte[1024];
- int numRead = -1;
- InputStream i = new FileInputStream(toEncode);
- try {
- do {
- numRead = i.read(buffer);
- if (numRead > 0) {
- md5.update(buffer, 0, numRead);
- }
- } while (numRead != -1);
- } finally {
- IOUtils.closeQuietly(i);
- }
- md5.doFinal(resBuf, 0);
- return resBuf;
- }
-
- public static Md5InputStreamResult generateMd5Result(InputStream toEncode)
- throws IOException {
- MD5Digest md5 = new MD5Digest();
- byte[] resBuf = new byte[md5.getDigestSize()];
- byte[] buffer = new byte[1024];
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- long length = 0;
- int numRead = -1;
- try {
- do {
- numRead = toEncode.read(buffer);
- if (numRead > 0) {
- length += numRead;
- md5.update(buffer, 0, numRead);
- out.write(buffer, 0, numRead);
- }
- } while (numRead != -1);
- } finally {
- out.close();
- IOUtils.closeQuietly(toEncode);
- }
- md5.doFinal(resBuf, 0);
- return new Md5InputStreamResult(out.toByteArray(), resBuf, length);
- }
-
- public static class Md5InputStreamResult {
- public final byte[] data;
- public final byte[] md5;
- public final long length;
-
- Md5InputStreamResult(byte[] data, byte[] md5, long length) {
- this.data = checkNotNull(data, "data");
- this.md5 = checkNotNull(md5, "md5");
- checkArgument(length >= 0, "length cannot me negative");
- this.length = length;
- }
-
- }
-
- public static String getContentAsStringAndClose(S3Object object)
- throws IOException {
- checkNotNull(object, "s3Object");
- checkNotNull(object.getData(), "s3Object.content");
- Object o = object.getData();
-
- if (o instanceof InputStream) {
- String returnVal = toStringAndClose((InputStream) o);
- if (object.getMetadata().getContentType().indexOf("xml") >= 0) {
+ }
+ public static Md5InputStreamResult generateMd5Result(InputStream toEncode) throws IOException {
+ MD5Digest md5 = new MD5Digest();
+ byte[] resBuf = new byte[md5.getDigestSize()];
+ byte[] buffer = new byte[1024];
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ long length = 0;
+ int numRead = -1;
+ try {
+ do {
+ numRead = toEncode.read(buffer);
+ if (numRead > 0) {
+ length += numRead;
+ md5.update(buffer, 0, numRead);
+ out.write(buffer, 0, numRead);
}
- return returnVal;
- } else {
- throw new IllegalArgumentException("Object type not supported: "
- + o.getClass().getName());
- }
- }
+ } while (numRead != -1);
+ } finally {
+ out.close();
+ IOUtils.closeQuietly(toEncode);
+ }
+ md5.doFinal(resBuf, 0);
+ return new Md5InputStreamResult(out.toByteArray(), resBuf, length);
+ }
+
+ public static class Md5InputStreamResult {
+ public final byte[] data;
+ public final byte[] md5;
+ public final long length;
+
+ Md5InputStreamResult(byte[] data, byte[] md5, long length) {
+ this.data = checkNotNull(data, "data");
+ this.md5 = checkNotNull(md5, "md5");
+ checkArgument(length >= 0, "length cannot me negative");
+ this.length = length;
+ }
+
+ }
+
+ public static String getContentAsStringAndClose(S3Object object) throws IOException {
+ checkNotNull(object, "s3Object");
+ checkNotNull(object.getData(), "s3Object.content");
+ Object o = object.getData();
+
+ if (o instanceof InputStream) {
+ String returnVal = toStringAndClose((InputStream) o);
+ if (object.getMetadata().getContentType().indexOf("xml") >= 0) {
+
+ }
+ return returnVal;
+ } else {
+ throw new IllegalArgumentException("Object type not supported: " + o.getClass().getName());
+ }
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java
index 60a612d11b..feebc915d0 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/CopyObjectHandler.java
@@ -24,8 +24,8 @@
package org.jclouds.aws.s3.xml;
import org.jclouds.aws.s3.domain.S3Object;
-import org.jclouds.aws.s3.util.DateService;
import org.jclouds.aws.s3.util.S3Utils;
+import org.jclouds.aws.util.DateService;
import org.jclouds.http.commands.callables.xml.ParseSax;
import com.google.inject.Inject;
@@ -35,39 +35,34 @@ import com.google.inject.Inject;
*
* CopyObjectResult is the document we expect to parse.
*
- * @see
+ * @see
* @author Adrian Cole
*/
-public class CopyObjectHandler extends
- ParseSax.HandlerWithResult {
+public class CopyObjectHandler extends ParseSax.HandlerWithResult {
- private S3Object.Metadata metadata;
- private StringBuilder currentText = new StringBuilder();
- @Inject
- private DateService dateParser;
+ private S3Object.Metadata metadata;
+ private StringBuilder currentText = new StringBuilder();
+ @Inject
+ private DateService dateParser;
- public void setKey(String key) {
- metadata = new S3Object.Metadata(key);
- }
+ public void setKey(String key) {
+ metadata = new S3Object.Metadata(key);
+ }
- public S3Object.Metadata getResult() {
- return metadata;
- }
+ public S3Object.Metadata getResult() {
+ return metadata;
+ }
- public void endElement(String uri, String name, String qName) {
- if (qName.equals("ETag")) {
- metadata.setMd5(S3Utils.fromHexString(currentText.toString()
- .replaceAll("\"", "")));
- } else if (qName.equals("LastModified")) {
- metadata.setLastModified(dateParser
- .iso8601DateParse(currentText.toString()));
- }
- currentText = new StringBuilder();
- }
+ public void endElement(String uri, String name, String qName) {
+ if (qName.equals("ETag")) {
+ metadata.setMd5(S3Utils.fromHexString(currentText.toString().replaceAll("\"", "")));
+ } else if (qName.equals("LastModified")) {
+ metadata.setLastModified(dateParser.iso8601DateParse(currentText.toString()));
+ }
+ currentText = new StringBuilder();
+ }
- public void characters(char ch[], int start, int length) {
- currentText.append(ch, start, length);
- }
+ public void characters(char ch[], int start, int length) {
+ currentText.append(ch, start, length);
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ErrorHandler.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ErrorHandler.java
index fc42d045ea..094811741d 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ErrorHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ErrorHandler.java
@@ -29,34 +29,35 @@ import org.jclouds.http.commands.callables.xml.ParseSax;
/**
* Parses the error from the Amazon S3 REST API.
*
- * @see
* @author Adrian Cole
*/
public class ErrorHandler extends ParseSax.HandlerWithResult {
- private S3Error error = new S3Error();
- private StringBuilder currentText = new StringBuilder();
+ private S3Error error = new S3Error();
+ private StringBuilder currentText = new StringBuilder();
- public S3Error getResult() {
- return error;
- }
+ public S3Error getResult() {
+ return error;
+ }
- public void endElement(String uri, String name, String qName) {
+ public void endElement(String uri, String name, String qName) {
- if (qName.equals("Code")) {
- error.setCode(currentText.toString());
- } else if (qName.equals("Message")) {
- error.setMessage(currentText.toString());
- } else if (qName.equals("RequestId")) {
- error.setRequestId(currentText.toString());
- } else if (!qName.equals("Error")) {
- error.getDetails().put(qName, currentText.toString());
- }
- currentText = new StringBuilder();
- }
+ if (qName.equals("Code")) {
+ error.setCode(currentText.toString());
+ } else if (qName.equals("Message")) {
+ error.setMessage(currentText.toString());
+ } else if (qName.equals("RequestId")) {
+ error.setRequestId(currentText.toString());
+ } else if (!qName.equals("Error")) {
+ error.getDetails().put(qName, currentText.toString());
+ }
+ currentText = new StringBuilder();
+ }
- public void characters(char ch[], int start, int length) {
- currentText.append(ch, start, length);
- }
+ public void characters(char ch[], int start, int length) {
+ currentText.append(ch, start, length);
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java
index 2c3c600e19..ad68745762 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListAllMyBucketsHandler.java
@@ -28,7 +28,7 @@ import java.util.List;
import org.jclouds.aws.s3.domain.CanonicalUser;
import org.jclouds.aws.s3.domain.S3Bucket;
-import org.jclouds.aws.s3.util.DateService;
+import org.jclouds.aws.util.DateService;
import org.jclouds.http.commands.callables.xml.ParseSax;
import com.google.inject.Inject;
@@ -38,47 +38,46 @@ import com.google.inject.Inject;
*
* ListAllMyBucketsResult xmlns="http://doc.s3.amazonaws.com/2006-03-01"
*
- * @see
* @author Adrian Cole
*/
-public class ListAllMyBucketsHandler extends
- ParseSax.HandlerWithResult> {
+public class ListAllMyBucketsHandler extends ParseSax.HandlerWithResult> {
- private List buckets = new ArrayList();
- private S3Bucket.Metadata currentS3Bucket;
- private CanonicalUser currentOwner;
- private StringBuilder currentText = new StringBuilder();
+ private List buckets = new ArrayList();
+ private S3Bucket.Metadata currentS3Bucket;
+ private CanonicalUser currentOwner;
+ private StringBuilder currentText = new StringBuilder();
- private final DateService dateParser;
+ private final DateService dateParser;
- @Inject
- public ListAllMyBucketsHandler(DateService dateParser) {
- this.dateParser = dateParser;
- }
+ @Inject
+ public ListAllMyBucketsHandler(DateService dateParser) {
+ this.dateParser = dateParser;
+ }
- public List getResult() {
- return buckets;
- }
+ public List getResult() {
+ return buckets;
+ }
- public void endElement(String uri, String name, String qName) {
- if (qName.equals("ID")) { // owner stuff
- currentOwner = new CanonicalUser(currentText.toString());
- } else if (qName.equals("DisplayName")) {
- currentOwner.setDisplayName(currentText.toString());
- } else if (qName.equals("Bucket")) {
- currentS3Bucket.setOwner(currentOwner);
- buckets.add(currentS3Bucket);
- } else if (qName.equals("Name")) {
- currentS3Bucket = new S3Bucket.Metadata(currentText.toString());
- } else if (qName.equals("CreationDate")) {
- currentS3Bucket.setCreationDate(dateParser
- .iso8601DateParse(currentText.toString()));
- }
- currentText = new StringBuilder();
- }
+ public void endElement(String uri, String name, String qName) {
+ if (qName.equals("ID")) { // owner stuff
+ currentOwner = new CanonicalUser(currentText.toString());
+ } else if (qName.equals("DisplayName")) {
+ currentOwner.setDisplayName(currentText.toString());
+ } else if (qName.equals("Bucket")) {
+ currentS3Bucket.setOwner(currentOwner);
+ buckets.add(currentS3Bucket);
+ } else if (qName.equals("Name")) {
+ currentS3Bucket = new S3Bucket.Metadata(currentText.toString());
+ } else if (qName.equals("CreationDate")) {
+ currentS3Bucket.setCreationDate(dateParser.iso8601DateParse(currentText.toString()));
+ }
+ currentText = new StringBuilder();
+ }
- public void characters(char ch[], int start, int length) {
- currentText.append(ch, start, length);
- }
+ public void characters(char ch[], int start, int length) {
+ currentText.append(ch, start, length);
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java
index a061b30d4c..4551d07459 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/ListBucketHandler.java
@@ -24,100 +24,99 @@
package org.jclouds.aws.s3.xml;
import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.inject.Inject;
+
import org.jclouds.aws.s3.domain.CanonicalUser;
import org.jclouds.aws.s3.domain.S3Bucket;
import org.jclouds.aws.s3.domain.S3Object;
-import org.jclouds.aws.s3.util.DateService;
import org.jclouds.aws.s3.util.S3Utils;
+import org.jclouds.aws.util.DateService;
import org.jclouds.http.commands.callables.xml.ParseSax;
import org.xml.sax.Attributes;
+import com.google.inject.Inject;
+
/**
* Parses the following XML document:
*
* ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01"
- *
+ *
* @author Adrian Cole
- * @see
*/
public class ListBucketHandler extends ParseSax.HandlerWithResult {
- private S3Bucket s3Bucket;
- private S3Object.Metadata currentObjectMetadata;
- private CanonicalUser currentOwner;
- private StringBuilder currentText = new StringBuilder();
+ private S3Bucket s3Bucket;
+ private S3Object.Metadata currentObjectMetadata;
+ private CanonicalUser currentOwner;
+ private StringBuilder currentText = new StringBuilder();
- private final DateService dateParser;
+ private final DateService dateParser;
- @Inject
- public ListBucketHandler(DateService dateParser) {
- this.dateParser = dateParser;
- }
+ @Inject
+ public ListBucketHandler(DateService dateParser) {
+ this.dateParser = dateParser;
+ }
- public S3Bucket getResult() {
- return s3Bucket;
- }
+ public S3Bucket getResult() {
+ return s3Bucket;
+ }
- public void setBucketName(String bucketName) {
- this.s3Bucket = new S3Bucket(checkNotNull(bucketName, "bucketName"));
- }
+ public void setBucketName(String bucketName) {
+ this.s3Bucket = new S3Bucket(checkNotNull(bucketName, "bucketName"));
+ }
- private boolean inCommonPrefixes;
+ private boolean inCommonPrefixes;
- public void startElement(String uri, String name, String qName,
- Attributes attrs) {
- if (qName.equals("CommonPrefixes")) {
- inCommonPrefixes = true;
- }
- }
+ public void startElement(String uri, String name, String qName, Attributes attrs) {
+ if (qName.equals("CommonPrefixes")) {
+ inCommonPrefixes = true;
+ }
+ }
- public void endElement(String uri, String name, String qName) {
- if (qName.equals("ID")) {
- currentOwner = new CanonicalUser(currentText.toString());
- } else if (qName.equals("DisplayName")) {
- currentOwner.setDisplayName(currentText.toString());
- } else if (qName.equals("Key")) { // content stuff
- currentObjectMetadata = new S3Object.Metadata(currentText
- .toString());
- } else if (qName.equals("LastModified")) {
- currentObjectMetadata.setLastModified(dateParser
- .iso8601DateParse(currentText.toString()));
- } else if (qName.equals("ETag")) {
- currentObjectMetadata.setMd5(S3Utils.fromHexString(currentText
- .toString().replaceAll("\"", "")));
- } else if (qName.equals("Size")) {
- currentObjectMetadata.setSize(Long
- .parseLong(currentText.toString()));
- } else if (qName.equals("Owner")) {
- currentObjectMetadata.setOwner(currentOwner);
- } else if (qName.equals("StorageClass")) {
- currentObjectMetadata.setStorageClass(currentText.toString());
- } else if (qName.equals("Contents")) {
- s3Bucket.getContents().add(currentObjectMetadata);
- } else if (qName.equals("Name")) {// bucketName stuff last, as least likely
- } else if (qName.equals("Prefix")) {
- String prefix = currentText.toString().trim();
- if (inCommonPrefixes)
- s3Bucket.getCommonPrefixes().add(prefix);
- else
- s3Bucket.setPrefix(prefix);
- } else if (qName.equals("Delimiter")) {
- if (!currentText.toString().equals(""))
- s3Bucket.setDelimiter(currentText.toString().trim());
- } else if (qName.equals("Marker")) {
- if (!currentText.toString().equals(""))
- s3Bucket.setMarker(currentText.toString());
- } else if (qName.equals("MaxKeys")) {
- s3Bucket.setMaxKeys(Long.parseLong(currentText.toString()));
- } else if (qName.equals("IsTruncated")) {
- boolean isTruncated = Boolean.parseBoolean(currentText.toString());
- s3Bucket.setTruncated(isTruncated);
- }
- currentText = new StringBuilder();
- }
+ public void endElement(String uri, String name, String qName) {
+ if (qName.equals("ID")) {
+ currentOwner = new CanonicalUser(currentText.toString());
+ } else if (qName.equals("DisplayName")) {
+ currentOwner.setDisplayName(currentText.toString());
+ } else if (qName.equals("Key")) { // content stuff
+ currentObjectMetadata = new S3Object.Metadata(currentText.toString());
+ } else if (qName.equals("LastModified")) {
+ currentObjectMetadata.setLastModified(dateParser.iso8601DateParse(currentText.toString()));
+ } else if (qName.equals("ETag")) {
+ currentObjectMetadata.setMd5(S3Utils.fromHexString(currentText.toString().replaceAll("\"",
+ "")));
+ } else if (qName.equals("Size")) {
+ currentObjectMetadata.setSize(Long.parseLong(currentText.toString()));
+ } else if (qName.equals("Owner")) {
+ currentObjectMetadata.setOwner(currentOwner);
+ } else if (qName.equals("StorageClass")) {
+ currentObjectMetadata.setStorageClass(currentText.toString());
+ } else if (qName.equals("Contents")) {
+ s3Bucket.getContents().add(currentObjectMetadata);
+ } else if (qName.equals("Name")) {// bucketName stuff last, as least likely
+ } else if (qName.equals("Prefix")) {
+ String prefix = currentText.toString().trim();
+ if (inCommonPrefixes)
+ s3Bucket.getCommonPrefixes().add(prefix);
+ else
+ s3Bucket.setPrefix(prefix);
+ } else if (qName.equals("Delimiter")) {
+ if (!currentText.toString().equals(""))
+ s3Bucket.setDelimiter(currentText.toString().trim());
+ } else if (qName.equals("Marker")) {
+ if (!currentText.toString().equals(""))
+ s3Bucket.setMarker(currentText.toString());
+ } else if (qName.equals("MaxKeys")) {
+ s3Bucket.setMaxKeys(Long.parseLong(currentText.toString()));
+ } else if (qName.equals("IsTruncated")) {
+ boolean isTruncated = Boolean.parseBoolean(currentText.toString());
+ s3Bucket.setTruncated(isTruncated);
+ }
+ currentText = new StringBuilder();
+ }
- public void characters(char ch[], int start, int length) {
- currentText.append(ch, start, length);
- }
+ public void characters(char ch[], int start, int length) {
+ currentText.append(ch, start, length);
+ }
}
diff --git a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java
index b7ddda2377..df0b55d5b1 100644
--- a/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java
+++ b/aws/s3/core/src/main/java/org/jclouds/aws/s3/xml/S3ParserFactory.java
@@ -23,81 +23,81 @@
*/
package org.jclouds.aws.s3.xml;
-import com.google.common.annotations.VisibleForTesting;
-import com.google.inject.Inject;
-import com.google.inject.Provider;
+import java.util.List;
+
import org.jclouds.aws.s3.domain.S3Bucket;
import org.jclouds.aws.s3.domain.S3Error;
import org.jclouds.aws.s3.domain.S3Object;
import org.jclouds.http.commands.callables.xml.ParseSax;
-import java.util.List;
+import com.google.common.annotations.VisibleForTesting;
+import com.google.inject.Inject;
+import com.google.inject.Provider;
/**
- * Creates Parsers needed to interpret S3 Server messages. This class uses guice
- * assisted inject, which mandates the creation of many single-method
- * interfaces. These interfaces are not intended for public api.
- *
+ * Creates Parsers needed to interpret S3 Server messages. This class uses guice assisted inject,
+ * which mandates the creation of many single-method interfaces. These interfaces are not intended
+ * for public api.
+ *
* @author Adrian Cole
*/
public class S3ParserFactory {
- @Inject
- private GenericParseFactory> parseListAllMyBucketsFactory;
+ @Inject
+ private GenericParseFactory> parseListAllMyBucketsFactory;
- @VisibleForTesting
- public static interface GenericParseFactory {
- ParseSax create(ParseSax.HandlerWithResult handler);
- }
+ @VisibleForTesting
+ public static interface GenericParseFactory {
+ ParseSax create(ParseSax.HandlerWithResult handler);
+ }
- @Inject
- Provider ListAllMyBucketsHandlerprovider;
+ @Inject
+ Provider ListAllMyBucketsHandlerprovider;
- /**
- * @return a parser used to handle {@link org.jclouds.aws.s3.commands.ListOwnedBuckets} responses
- */
- public ParseSax> createListBucketsParser() {
- return parseListAllMyBucketsFactory
- .create(ListAllMyBucketsHandlerprovider.get());
- }
+ /**
+ * @return a parser used to handle {@link org.jclouds.aws.s3.commands.ListOwnedBuckets} responses
+ */
+ public ParseSax> createListBucketsParser() {
+ return parseListAllMyBucketsFactory.create(ListAllMyBucketsHandlerprovider.get());
+ }
- @Inject
- private GenericParseFactory parseListBucketFactory;
+ @Inject
+ private GenericParseFactory parseListBucketFactory;
- @Inject
- Provider ListBucketHandlerprovider;
+ @Inject
+ Provider ListBucketHandlerprovider;
- /**
- * @return a parser used to handle {@link org.jclouds.aws.s3.commands.ListBucket} responses
- */
- public ParseSax createListBucketParser() {
- return parseListBucketFactory.create(ListBucketHandlerprovider.get());
- }
+ /**
+ * @return a parser used to handle {@link org.jclouds.aws.s3.commands.ListBucket} responses
+ */
+ public ParseSax createListBucketParser() {
+ return parseListBucketFactory.create(ListBucketHandlerprovider.get());
+ }
- @Inject
- private GenericParseFactory parseCopyObjectFactory;
+ @Inject
+ private GenericParseFactory parseCopyObjectFactory;
- @Inject
- Provider copyObjectHandlerProvider;
+ @Inject
+ Provider copyObjectHandlerProvider;
- /**
- * @return a parser used to handle {@link org.jclouds.aws.s3.commands.CopyObject} responses
- */
- public ParseSax createCopyObjectParser() {
- return parseCopyObjectFactory.create(copyObjectHandlerProvider.get());
- }
+ /**
+ * @return a parser used to handle {@link org.jclouds.aws.s3.commands.CopyObject} responses
+ */
+ public ParseSax createCopyObjectParser() {
+ return parseCopyObjectFactory.create(copyObjectHandlerProvider.get());
+ }
- @Inject
- private GenericParseFactory parseErrorFactory;
+ @Inject
+ private GenericParseFactory parseErrorFactory;
- @Inject
- Provider errorHandlerProvider;
+ @Inject
+ Provider errorHandlerProvider;
- /**
- * @return a parser used to handle error conditions.
- */
- public ParseSax createErrorParser() {
- return parseErrorFactory.create(errorHandlerProvider.get());
- }
+ /**
+ * @return a parser used to handle error conditions.
+ */
+ public ParseSax createErrorParser() {
+ return parseErrorFactory.create(errorHandlerProvider.get());
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/BaseS3MapIntegrationTest.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/BaseS3MapIntegrationTest.java
index 08371637e6..aa953d0ba8 100644
--- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/BaseS3MapIntegrationTest.java
+++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/BaseS3MapIntegrationTest.java
@@ -23,124 +23,125 @@
*/
package org.jclouds.aws.s3;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-import org.apache.commons.io.IOUtils;
-import org.jclouds.aws.s3.internal.BaseS3Map;
import static org.testng.Assert.assertEquals;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Parameters;
-import org.testng.annotations.Test;
-import java.io.*;
-import java.lang.reflect.Method;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
import java.util.Map;
import java.util.TreeSet;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeoutException;
+import org.apache.commons.io.IOUtils;
+import org.jclouds.aws.s3.internal.BaseS3Map;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
@Test
public abstract class BaseS3MapIntegrationTest extends S3IntegrationTest {
- public abstract void testPutAll();
+ public abstract void testPutAll();
- public abstract void testEntrySet() throws IOException;
+ public abstract void testEntrySet() throws IOException;
- public abstract void testValues() throws IOException;
+ public abstract void testValues() throws IOException;
- protected BaseS3Map map;
- protected Map fiveStrings = ImmutableMap.of("one", "apple",
- "two", "bear", "three", "candy", "four", "dogma", "five", "emma");
-
- // IMPORTANT: Java 5 struggles to correctly infer types in some cases which affects
- // this ImmutableMap. The explicit typing works around the issue. Java 6 seems to cope.
- // http://groups.google.com/group/google-collections-users/browse_thread/thread/df70c482c93a25d8
- protected Map fiveBytes = ImmutableMap.of(
- "one", "apple".getBytes(), // Explicit cast necessary for Java 5
- "two", "bear".getBytes(), "three", "candy".getBytes(),
- "four", "dogma".getBytes(), "five", "emma".getBytes());
- protected Map fiveInputs;
- protected Map fiveFiles;
- String tmpDirectory;
+ protected BaseS3Map map;
+ protected Map fiveStrings = ImmutableMap.of("one", "apple", "two", "bear",
+ "three", "candy", "four", "dogma", "five", "emma");
- @BeforeMethod(dependsOnMethods = "setUpBucket", groups = {"integration", "live"})
- @Parameters({"basedir"})
- protected void setUpTempDir(String basedir) throws InterruptedException,
- ExecutionException, FileNotFoundException, IOException,
- TimeoutException {
- tmpDirectory = basedir + File.separator + "target" + File.separator
- + "testFiles" + File.separator + getClass().getSimpleName();
- new File(tmpDirectory).mkdirs();
+ // IMPORTANT: Java 5 struggles to correctly infer types in some cases which affects
+ // this ImmutableMap. The explicit typing works around the issue. Java 6 seems to cope.
+ // http://groups.google.com/group/google-collections-users/browse_thread/thread/df70c482c93a25d8
+ protected Map fiveBytes = ImmutableMap. of("one",
+ "apple".getBytes(), // Explicit cast necessary for Java 5
+ "two", "bear".getBytes(), "three", "candy".getBytes(), "four", "dogma".getBytes(),
+ "five", "emma".getBytes());
+ protected Map fiveInputs;
+ protected Map fiveFiles;
+ String tmpDirectory;
- fiveFiles = ImmutableMap.of("one", new File(tmpDirectory, "apple"),
- "two", new File(tmpDirectory, "bear"), "three", new File(
- tmpDirectory, "candy"), "four", new File(tmpDirectory,
- "dogma"), "five", new File(tmpDirectory, "emma"));
+ @BeforeMethod(dependsOnMethods = "setUpBucket", groups = { "integration", "live" })
+ @Parameters( { "basedir" })
+ protected void setUpTempDir(String basedir) throws InterruptedException, ExecutionException,
+ FileNotFoundException, IOException, TimeoutException {
+ tmpDirectory = basedir + File.separator + "target" + File.separator + "testFiles"
+ + File.separator + getClass().getSimpleName();
+ new File(tmpDirectory).mkdirs();
- for (File file : fiveFiles.values()) {
- IOUtils.write(file.getName(), new FileOutputStream(file));
- }
+ fiveFiles = ImmutableMap.of("one", new File(tmpDirectory, "apple"), "two", new File(
+ tmpDirectory, "bear"), "three", new File(tmpDirectory, "candy"), "four", new File(
+ tmpDirectory, "dogma"), "five", new File(tmpDirectory, "emma"));
- fiveInputs = ImmutableMap.of("one", IOUtils.toInputStream("apple"),
- "two", IOUtils.toInputStream("bear"), "three", IOUtils
- .toInputStream("candy"), "four", IOUtils
- .toInputStream("dogma"), "five", IOUtils
- .toInputStream("emma"));
- map = createMap(context, bucketName);
- map.clear();
- }
+ for (File file : fiveFiles.values()) {
+ IOUtils.write(file.getName(), new FileOutputStream(file));
+ }
- protected abstract BaseS3Map createMap(S3Context context, String bucket);
+ fiveInputs = ImmutableMap.of("one", IOUtils.toInputStream("apple"), "two", IOUtils
+ .toInputStream("bear"), "three", IOUtils.toInputStream("candy"), "four", IOUtils
+ .toInputStream("dogma"), "five", IOUtils.toInputStream("emma"));
+ map = createMap(context, bucketName);
+ map.clear();
+ }
- @Test(groups = {"integration", "live"})
- public void testClear() {
- map.clear();
- assertEquals(map.size(), 0);
- putString("one", "apple");
- assertEquals(map.size(), 1);
- map.clear();
- assertEquals(map.size(), 0);
- }
+ protected abstract BaseS3Map createMap(S3Context context, String bucket);
- @Test(groups = {"integration", "live"})
- public abstract void testRemove() throws IOException;
+ @Test(groups = { "integration", "live" })
+ public void testClear() {
+ map.clear();
+ assertEquals(map.size(), 0);
+ putString("one", "apple");
+ assertEquals(map.size(), 1);
+ map.clear();
+ assertEquals(map.size(), 0);
+ }
- @Test(groups = {"integration", "live"})
- public void testKeySet() {
- assertEquals(map.keySet().size(), 0);
- putString("one", "two");
- assertEquals(map.keySet(), ImmutableSet.of("one"));
- }
+ @Test(groups = { "integration", "live" })
+ public abstract void testRemove() throws IOException;
- @Test(groups = {"integration", "live"})
- public void testContainsKey() {
- assert !map.containsKey("one");
- putString("one", "apple");
- assert map.containsKey("one");
- }
+ @Test(groups = { "integration", "live" })
+ public void testKeySet() {
+ assertEquals(map.keySet().size(), 0);
+ putString("one", "two");
+ assertEquals(map.keySet(), ImmutableSet.of("one"));
+ }
- @Test(groups = {"integration", "live"})
- public void testIsEmpty() {
- assert map.isEmpty();
- putString("one", "apple");
- assert !map.isEmpty();
- }
+ @Test(groups = { "integration", "live" })
+ public void testContainsKey() {
+ assert !map.containsKey("one");
+ putString("one", "apple");
+ assert map.containsKey("one");
+ }
- abstract protected void putString(String key, String value);
+ @Test(groups = { "integration", "live" })
+ public void testIsEmpty() {
+ assert map.isEmpty();
+ putString("one", "apple");
+ assert !map.isEmpty();
+ }
- protected void fourLeftRemovingOne() {
- map.remove("one");
- assertEquals(map.size(), 4);
- assertEquals(new TreeSet(map.keySet()), new TreeSet(
- ImmutableSet.of("two", "three", "four", "five")));
- }
+ abstract protected void putString(String key, String value);
- @Test(groups = {"integration", "live"})
- public abstract void testPut() throws IOException;
+ protected void fourLeftRemovingOne() {
+ map.remove("one");
+ assertEquals(map.size(), 4);
+ assertEquals(new TreeSet(map.keySet()), new TreeSet(ImmutableSet.of("two",
+ "three", "four", "five")));
+ }
- @Test(groups = {"integration", "live"})
- public void testGetBucket() {
- assertEquals(map.getBucket().getName(), bucketName);
- }
+ @Test(groups = { "integration", "live" })
+ public abstract void testPut() throws IOException;
+
+ @Test(groups = { "integration", "live" })
+ public void testGetBucket() {
+ assertEquals(map.getBucket().getName(), bucketName);
+ }
}
\ No newline at end of file
diff --git a/aws/s3/core/src/test/java/org/jclouds/aws/s3/StubS3Connection.java b/aws/s3/core/src/test/java/org/jclouds/aws/s3/StubS3Connection.java
index 5c77c7b431..94a9dd974f 100644
--- a/aws/s3/core/src/test/java/org/jclouds/aws/s3/StubS3Connection.java
+++ b/aws/s3/core/src/test/java/org/jclouds/aws/s3/StubS3Connection.java
@@ -23,471 +23,482 @@
*/
package org.jclouds.aws.s3;
-import com.google.common.base.Function;
import static com.google.common.base.Preconditions.checkNotNull;
+import static org.easymock.classextension.EasyMock.createNiceMock;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.output.ByteArrayOutputStream;
+import org.jclouds.aws.s3.commands.CopyObject;
+import org.jclouds.aws.s3.commands.options.CopyObjectOptions;
+import org.jclouds.aws.s3.commands.options.GetObjectOptions;
+import org.jclouds.aws.s3.commands.options.ListBucketOptions;
+import org.jclouds.aws.s3.commands.options.PutBucketOptions;
+import org.jclouds.aws.s3.commands.options.PutObjectOptions;
+import org.jclouds.aws.s3.domain.S3Bucket;
+import org.jclouds.aws.s3.domain.S3Object;
+import org.jclouds.aws.s3.domain.S3Bucket.Metadata;
+import org.jclouds.aws.s3.domain.acl.CannedAccessPolicy;
+import org.jclouds.aws.s3.util.S3Utils;
+import org.jclouds.aws.util.DateService;
+import org.jclouds.http.HttpResponse;
+import org.jclouds.http.HttpResponseException;
+import org.joda.time.DateTime;
+
+import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import com.thoughtworks.xstream.XStream;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.io.output.ByteArrayOutputStream;
-import static org.easymock.classextension.EasyMock.createNiceMock;
-import org.jclouds.aws.s3.commands.CopyObject;
-import org.jclouds.aws.s3.commands.options.*;
-import org.jclouds.aws.s3.domain.S3Bucket;
-import org.jclouds.aws.s3.domain.S3Bucket.Metadata;
-import org.jclouds.aws.s3.domain.S3Object;
-import org.jclouds.aws.s3.domain.acl.CannedAccessPolicy;
-import org.jclouds.aws.s3.util.DateService;
-import org.jclouds.aws.s3.util.S3Utils;
-import org.jclouds.http.HttpResponse;
-import org.jclouds.http.HttpResponseException;
-import org.joda.time.DateTime;
-
-import java.io.*;
-import java.net.URLDecoder;
-import java.util.*;
-import java.util.concurrent.*;
/**
* // TODO: Adrian: Document this!
- *
+ *
* @author Adrian Cole
*/
public class StubS3Connection implements S3Connection {
- private static Map> bucketToContents = new ConcurrentHashMap>();
- private static Map bucketToLocation = new ConcurrentHashMap();
- private static Map keyToAcl = new ConcurrentHashMap();
+ private static Map> bucketToContents = new ConcurrentHashMap>();
+ private static Map bucketToLocation = new ConcurrentHashMap();
+ private static Map keyToAcl = new ConcurrentHashMap();
- /**
- * @throws java.io.IOException
- */
- public static byte[] toByteArray(Object data) throws IOException {
- checkNotNull(data, "data must be set before calling generateMd5()");
- byte[] bytes = null;
- if (data == null || data instanceof byte[]) {
- bytes = (byte[]) data;
- } else if (data instanceof String) {
- bytes = ((String) data).getBytes();
- } else if (data instanceof File || data instanceof InputStream) {
- InputStream io = (data instanceof InputStream) ? (InputStream) data : new FileInputStream((File) data);
- bytes = IOUtils.toByteArray(io);
- IOUtils.closeQuietly(io);
- } else {
- throw new UnsupportedOperationException("Content not supported "
- + data.getClass());
- }
- return bytes;
+ /**
+ * @throws java.io.IOException
+ */
+ public static byte[] toByteArray(Object data) throws IOException {
+ checkNotNull(data, "data must be set before calling generateMd5()");
+ byte[] bytes = null;
+ if (data == null || data instanceof byte[]) {
+ bytes = (byte[]) data;
+ } else if (data instanceof String) {
+ bytes = ((String) data).getBytes();
+ } else if (data instanceof File || data instanceof InputStream) {
+ InputStream io = (data instanceof InputStream) ? (InputStream) data : new FileInputStream(
+ (File) data);
+ bytes = IOUtils.toByteArray(io);
+ IOUtils.closeQuietly(io);
+ } else {
+ throw new UnsupportedOperationException("Content not supported " + data.getClass());
+ }
+ return bytes;
- }
+ }
- public Future getObject(final String s3Bucket, final String key) {
- return getObject(s3Bucket, key, new GetObjectOptions());
+ public Future getObject(final String s3Bucket, final String key) {
+ return getObject(s3Bucket, key, new GetObjectOptions());
- }
+ }
- public S3Object.Metadata copy(S3Object.Metadata in) {
- return (S3Object.Metadata) xstream.fromXML(xstream.toXML(in));
- }
+ public S3Object.Metadata copy(S3Object.Metadata in) {
+ return (S3Object.Metadata) xstream.fromXML(xstream.toXML(in));
+ }
- public S3Object.Metadata copy(S3Object.Metadata in, String newKey) {
- return (S3Object.Metadata) xstream.fromXML(xstream.toXML(in).replaceAll(in.getKey(), newKey));
- }
+ public S3Object.Metadata copy(S3Object.Metadata in, String newKey) {
+ return (S3Object.Metadata) xstream.fromXML(xstream.toXML(in).replaceAll(in.getKey(), newKey));
+ }
- public Future headObject(final String s3Bucket,
- final String key) {
- return new FutureBase() {
- public S3Object.Metadata get() throws InterruptedException,
- ExecutionException {
- if (!bucketToContents.containsKey(s3Bucket))
- return S3Object.Metadata.NOT_FOUND;
- Map realContents = bucketToContents
- .get(s3Bucket);
- if (!realContents.containsKey(key))
- return S3Object.Metadata.NOT_FOUND;
- return realContents.get(key).getMetadata();
+ public Future headObject(final String s3Bucket, final String key) {
+ return new FutureBase() {
+ public S3Object.Metadata get() throws InterruptedException, ExecutionException {
+ if (!bucketToContents.containsKey(s3Bucket))
+ return S3Object.Metadata.NOT_FOUND;
+ Map realContents = bucketToContents.get(s3Bucket);
+ if (!realContents.containsKey(key))
+ return S3Object.Metadata.NOT_FOUND;
+ return realContents.get(key).getMetadata();
+ }
+ };
+ }
+
+ public Future deleteObject(final String s3Bucket, final String key) {
+ return new FutureBase() {
+ public Boolean get() throws InterruptedException, ExecutionException {
+ if (bucketToContents.containsKey(s3Bucket)) {
+ bucketToContents.get(s3Bucket).remove(key);
}
- };
- }
-
- public Future deleteObject(final String s3Bucket, final String key) {
- return new FutureBase() {
- public Boolean get() throws InterruptedException,
- ExecutionException {
- if (bucketToContents.containsKey(s3Bucket)) {
- bucketToContents.get(s3Bucket).remove(key);
- }
- return true;
- }
- };
- }
-
- public Future putObject(final String s3Bucket, final S3Object object) {
- return putObject(s3Bucket, object, new PutObjectOptions());
- }
-
- public Future putBucketIfNotExists(final String s3Bucket) {
- return new FutureBase() {
- public Boolean get() throws InterruptedException,
- ExecutionException {
- if (!bucketToContents.containsKey(s3Bucket)) {
- bucketToContents.put(s3Bucket,
- new ConcurrentHashMap());
- }
- return bucketToContents.containsKey(s3Bucket);
- }
- };
- }
-
- public Future deleteBucketIfEmpty(final String s3Bucket) {
- return new FutureBase() {
- public Boolean get() throws InterruptedException,
- ExecutionException {
- if (bucketToContents.containsKey(s3Bucket)) {
- if (bucketToContents.get(s3Bucket).size() == 0)
- bucketToContents.remove(s3Bucket);
- else
- return false;
- }
- return true;
- }
- };
- }
-
- XStream xstream = new XStream();
-
- public Future copyObject(final String sourceBucket,
- final String sourceObject, final String destinationBucket,
- final String destinationObject) {
- return copyObject(sourceBucket, sourceObject, destinationBucket, destinationObject, new CopyObjectOptions());
- }
-
- public Future bucketExists(final String s3Bucket) {
- return new FutureBase() {
- public Boolean get() throws InterruptedException,
- ExecutionException {
- return bucketToContents.containsKey(s3Bucket);
- }
- };
- }
-
- public Future listBucket(final String s3Bucket) {
- return listBucket(s3Bucket, new ListBucketOptions());
- }
-
- private abstract class FutureBase implements Future {
- public boolean cancel(boolean b) {
- return false;
- }
-
- public boolean isCancelled() {
- return false;
- }
-
- public boolean isDone() {
return true;
- }
+ }
+ };
+ }
- public V get(long l, TimeUnit timeUnit) throws InterruptedException,
- ExecutionException, TimeoutException {
- return get();
- }
- }
+ public Future putObject(final String s3Bucket, final S3Object object) {
+ return putObject(s3Bucket, object, new PutObjectOptions());
+ }
- public Future> listOwnedBuckets() {
- return new FutureBase>() {
- public List get() throws InterruptedException,
- ExecutionException {
- return Lists.newArrayList(Iterables.transform(
- bucketToContents.keySet(),
- new Function() {
- public Metadata apply(String name) {
- return new S3Bucket.Metadata(name);
- }
- }));
+ public Future putBucketIfNotExists(final String s3Bucket) {
+ return new FutureBase() {
+ public Boolean get() throws InterruptedException, ExecutionException {
+ if (!bucketToContents.containsKey(s3Bucket)) {
+ bucketToContents.put(s3Bucket, new ConcurrentHashMap());
}
- };
- }
+ return bucketToContents.containsKey(s3Bucket);
+ }
+ };
+ }
- public Future putBucketIfNotExists(String name,
- PutBucketOptions options) {
- if (options.getLocationConstraint() != null)
- bucketToLocation.put(name, options.getLocationConstraint());
- keyToAcl.put(name, options.getAcl());
- return putBucketIfNotExists(name);
- }
-
- class DelimiterFilter implements Predicate {
- private final String prefix;
- private final String delimiter;
-
- DelimiterFilter(String prefix, String delimiter) {
- this.prefix = prefix;
- this.delimiter = delimiter;
- }
-
- public boolean apply(S3Object.Metadata metadata) {
- if (prefix == null)
- return metadata.getKey().indexOf(delimiter) == -1;
- if (metadata.getKey().startsWith(prefix))
- return metadata.getKey().replaceFirst(prefix, "").indexOf(delimiter) == -1;
- return false;
- }
- }
-
- class CommonPrefixes implements Function {
- private final String prefix;
- private final String delimiter;
- static final String NO_PREFIX = "NO_PREFIX";
-
- CommonPrefixes(String prefix, String delimiter) {
- this.prefix = prefix;
- this.delimiter = delimiter;
- }
-
- public String apply(S3Object.Metadata metadata) {
- String working = metadata.getKey();
-
- if (prefix != null) {
- if (working.startsWith(prefix)) {
- working = working.replaceFirst(prefix, "");
- }
+ public Future deleteBucketIfEmpty(final String s3Bucket) {
+ return new FutureBase() {
+ public Boolean get() throws InterruptedException, ExecutionException {
+ if (bucketToContents.containsKey(s3Bucket)) {
+ if (bucketToContents.get(s3Bucket).size() == 0)
+ bucketToContents.remove(s3Bucket);
+ else
+ return false;
}
- if (working.contains(delimiter)) {
- return working.substring(0, working.indexOf(delimiter));
- }
- return NO_PREFIX;
- }
- }
+ return true;
+ }
+ };
+ }
- public Future listBucket(final String name, final ListBucketOptions options) {
- return new FutureBase() {
- public S3Bucket get() throws InterruptedException,
- ExecutionException {
- final Map realContents = bucketToContents
- .get(name);
+ XStream xstream = new XStream();
- if (realContents == null) return S3Bucket.NOT_FOUND;
- SortedSet contents = Sets.newTreeSet(
- Iterables.transform(realContents.keySet(),
- new Function() {
- public S3Object.Metadata apply(String key) {
- return realContents.get(key).getMetadata();
- }
- }));
- S3Bucket returnVal = new S3Bucket(name);
+ public Future copyObject(final String sourceBucket,
+ final String sourceObject, final String destinationBucket,
+ final String destinationObject) {
+ return copyObject(sourceBucket, sourceObject, destinationBucket, destinationObject,
+ new CopyObjectOptions());
+ }
- if (options.getMarker() != null) {
- final String marker;
- try {
- marker = URLDecoder.decode(options.getMarker(), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new IllegalArgumentException(e);
- }
- S3Object.Metadata lastMarkerMetadata =
- Iterables.find(contents, new Predicate() {
- public boolean apply(S3Object.Metadata metadata) {
- return metadata.getKey().equals(marker);
- }
- });
- contents = contents.tailSet(lastMarkerMetadata);
- // amazon spec means after the marker, not including it.
- contents.remove(lastMarkerMetadata);
- returnVal.setMarker(marker);
- }
+ public Future bucketExists(final String s3Bucket) {
+ return new FutureBase() {
+ public Boolean get() throws InterruptedException, ExecutionException {
+ return bucketToContents.containsKey(s3Bucket);
+ }
+ };
+ }
+ public Future listBucket(final String s3Bucket) {
+ return listBucket(s3Bucket, new ListBucketOptions());
+ }
- if (options.getPrefix() != null) {
- contents = Sets.newTreeSet(Iterables.filter(contents, new Predicate() {
+ private abstract class FutureBase implements Future {
+ public boolean cancel(boolean b) {
+ return false;
+ }
- public boolean apply(S3Object.Metadata o) {
- return (o != null && o.getKey().startsWith(URLDecoder.decode(options.getPrefix())));
+ public boolean isCancelled() {
+ return false;
+ }
+
+ public boolean isDone() {
+ return true;
+ }
+
+ public V get(long l, TimeUnit timeUnit) throws InterruptedException, ExecutionException,
+ TimeoutException {
+ return get();
+ }
+ }
+
+ public Future> listOwnedBuckets() {
+ return new FutureBase>() {
+ public List get() throws InterruptedException, ExecutionException {
+ return Lists.newArrayList(Iterables.transform(bucketToContents.keySet(),
+ new Function() {
+ public Metadata apply(String name) {
+ return new S3Bucket.Metadata(name);
}
- }));
- returnVal.setPrefix(URLDecoder.decode(options.getPrefix()));
- }
+ }));
+ }
+ };
+ }
- if (options.getDelimiter() != null) {
- Iterable iterable = Iterables.transform(contents, new CommonPrefixes(
- options.getPrefix() != null ? URLDecoder.decode(options.getPrefix()) : null, URLDecoder.decode(options.getDelimiter())));
- Set commonPrefixes = iterable != null ? Sets.newTreeSet(iterable) : new HashSet();
- commonPrefixes.remove(CommonPrefixes.NO_PREFIX);
+ public Future putBucketIfNotExists(String name, PutBucketOptions options) {
+ if (options.getLocationConstraint() != null)
+ bucketToLocation.put(name, options.getLocationConstraint());
+ keyToAcl.put(name, options.getAcl());
+ return putBucketIfNotExists(name);
+ }
- contents = Sets.newTreeSet(Iterables.filter(contents, new DelimiterFilter(
- options.getPrefix() != null ? URLDecoder.decode(options.getPrefix()) : null, URLDecoder.decode(options.getDelimiter()))));
+ class DelimiterFilter implements Predicate {
+ private final String prefix;
+ private final String delimiter;
- returnVal.setCommonPrefixes(commonPrefixes);
- returnVal.setDelimiter(URLDecoder.decode(options.getDelimiter()));
- }
- if (options.getMaxKeys() != null) {
- contents = firstSliceOfSize(contents, Integer.parseInt(options.getMaxKeys()));
- returnVal.setMaxKeys(Integer.parseInt(options.getMaxKeys()));
- returnVal.setTruncated(true);
- }
+ DelimiterFilter(String prefix, String delimiter) {
+ this.prefix = prefix;
+ this.delimiter = delimiter;
+ }
- returnVal.setContents(contents);
- return returnVal;
+ public boolean apply(S3Object.Metadata metadata) {
+ if (prefix == null)
+ return metadata.getKey().indexOf(delimiter) == -1;
+ if (metadata.getKey().startsWith(prefix))
+ return metadata.getKey().replaceFirst(prefix, "").indexOf(delimiter) == -1;
+ return false;
+ }
+ }
+
+ class CommonPrefixes implements Function {
+ private final String prefix;
+ private final String delimiter;
+ static final String NO_PREFIX = "NO_PREFIX";
+
+ CommonPrefixes(String prefix, String delimiter) {
+ this.prefix = prefix;
+ this.delimiter = delimiter;
+ }
+
+ public String apply(S3Object.Metadata metadata) {
+ String working = metadata.getKey();
+
+ if (prefix != null) {
+ if (working.startsWith(prefix)) {
+ working = working.replaceFirst(prefix, "");
}
- };
- }
+ }
+ if (working.contains(delimiter)) {
+ return working.substring(0, working.indexOf(delimiter));
+ }
+ return NO_PREFIX;
+ }
+ }
- public static