From a788a98f7037adc1bc8598967e40f7c9e2f4756a Mon Sep 17 00:00:00 2001 From: Adrian Cole Date: Wed, 1 Sep 2010 08:59:33 -0700 Subject: [PATCH] moved classes into packages more aligned with existing conventions --- .../org/jclouds/filesystem/FilesystemAsyncBlobStore.java | 2 +- .../filesystem/{config => }/FilesystemBlobStore.java | 4 ++-- .../config/FilesystemBlobStoreContextModule.java | 7 ++++--- .../filesystem/config/FilesystemBlobStoreModule.java | 1 + .../{config => reference}/FilesystemConstants.java | 2 +- .../{utils => strategy}/FilesystemStorageStrategy.java | 2 +- .../internal}/FilesystemStorageStrategyImpl.java | 6 ++++-- .../{utils => util/internal}/FileSystemBlobUtilsImpl.java | 3 ++- .../jclouds/filesystem/FilesystemAsyncBlobStoreTest.java | 2 +- .../filesystem/integration/FilesystemTestInitializer.java | 3 ++- .../internal}/FilesystemStorageStrategyImplTest.java | 5 ++++- 11 files changed, 23 insertions(+), 14 deletions(-) rename filesystem/src/main/java/org/jclouds/filesystem/{config => }/FilesystemBlobStore.java (86%) rename filesystem/src/main/java/org/jclouds/filesystem/{config => reference}/FilesystemConstants.java (96%) rename filesystem/src/main/java/org/jclouds/filesystem/{utils => strategy}/FilesystemStorageStrategy.java (99%) rename filesystem/src/main/java/org/jclouds/filesystem/{utils => strategy/internal}/FilesystemStorageStrategyImpl.java (98%) rename filesystem/src/main/java/org/jclouds/filesystem/{utils => util/internal}/FileSystemBlobUtilsImpl.java (95%) rename filesystem/src/test/java/org/jclouds/filesystem/{utils => strategy/internal}/FilesystemStorageStrategyImplTest.java (98%) diff --git a/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java b/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java index 9e4cce87c2..e384400b94 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/FilesystemAsyncBlobStore.java @@ -79,6 +79,7 @@ import org.jclouds.crypto.Crypto; import org.jclouds.crypto.CryptoStreams; import org.jclouds.date.DateService; import org.jclouds.domain.Location; +import org.jclouds.filesystem.strategy.FilesystemStorageStrategy; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpResponse; @@ -99,7 +100,6 @@ import org.jclouds.blobstore.BlobStoreContext; import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.blobstore.KeyNotFoundException; import org.jclouds.blobstore.domain.internal.MutableBlobMetadataImpl; -import org.jclouds.filesystem.utils.FilesystemStorageStrategy; import org.jclouds.io.Payload; import org.jclouds.io.payloads.FilePayload; import org.jclouds.logging.Logger; diff --git a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStore.java b/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStore.java similarity index 86% rename from filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStore.java rename to filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStore.java index 2d4999baff..983518f88d 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStore.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/FilesystemBlobStore.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.filesystem.config; +package org.jclouds.filesystem; import java.util.concurrent.TimeUnit; @@ -28,5 +28,5 @@ import org.jclouds.concurrent.Timeout; * * @author Alfredo "Rainbowbreeze" Morresi */ -@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) interface FilesystemBlobStore extends BlobStore { +@Timeout(duration = 30, timeUnit = TimeUnit.SECONDS) public interface FilesystemBlobStore extends BlobStore { } diff --git a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java b/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java index cc19f21400..85b244f710 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreContextModule.java @@ -39,9 +39,10 @@ import org.jclouds.blobstore.util.BlobUtils; import org.jclouds.domain.Location; import org.jclouds.domain.LocationScope; import org.jclouds.domain.internal.LocationImpl; -import org.jclouds.filesystem.utils.FileSystemBlobUtilsImpl; -import org.jclouds.filesystem.utils.FilesystemStorageStrategy; -import org.jclouds.filesystem.utils.FilesystemStorageStrategyImpl; +import org.jclouds.filesystem.FilesystemBlobStore; +import org.jclouds.filesystem.strategy.FilesystemStorageStrategy; +import org.jclouds.filesystem.strategy.internal.FilesystemStorageStrategyImpl; +import org.jclouds.filesystem.util.internal.FileSystemBlobUtilsImpl; /** * diff --git a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreModule.java b/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreModule.java index 9818d3d79a..6a078d801a 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreModule.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemBlobStoreModule.java @@ -21,6 +21,7 @@ package org.jclouds.filesystem.config; import org.jclouds.blobstore.AsyncBlobStore; import org.jclouds.filesystem.FilesystemAsyncBlobStore; +import org.jclouds.filesystem.FilesystemBlobStore; import org.jclouds.rest.config.RestClientModule; /** diff --git a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemConstants.java b/filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java similarity index 96% rename from filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemConstants.java rename to filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java index 49bc36bb73..c8afc9ae05 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/config/FilesystemConstants.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/reference/FilesystemConstants.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.filesystem.config; +package org.jclouds.filesystem.reference; /** * Common constants used in filesystem provider diff --git a/filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategy.java b/filesystem/src/main/java/org/jclouds/filesystem/strategy/FilesystemStorageStrategy.java similarity index 99% rename from filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategy.java rename to filesystem/src/main/java/org/jclouds/filesystem/strategy/FilesystemStorageStrategy.java index 0956df977a..45d150ffa9 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategy.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/strategy/FilesystemStorageStrategy.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.filesystem.utils; +package org.jclouds.filesystem.strategy; import java.io.File; import java.io.IOException; diff --git a/filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImpl.java b/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java similarity index 98% rename from filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImpl.java rename to filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java index a565d1095a..afb7a854f1 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImpl.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImpl.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.filesystem.utils; +package org.jclouds.filesystem.strategy.internal; import java.io.OutputStream; import java.util.Set; @@ -37,7 +37,9 @@ import java.io.File; import javax.annotation.Resource; import com.google.inject.Inject; import com.google.inject.name.Named; -import org.jclouds.filesystem.config.FilesystemConstants; + +import org.jclouds.filesystem.reference.FilesystemConstants; +import org.jclouds.filesystem.strategy.FilesystemStorageStrategy; import org.jclouds.logging.Logger; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/filesystem/src/main/java/org/jclouds/filesystem/utils/FileSystemBlobUtilsImpl.java b/filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java similarity index 95% rename from filesystem/src/main/java/org/jclouds/filesystem/utils/FileSystemBlobUtilsImpl.java rename to filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java index 613c5302c8..ffffafdc8a 100644 --- a/filesystem/src/main/java/org/jclouds/filesystem/utils/FileSystemBlobUtilsImpl.java +++ b/filesystem/src/main/java/org/jclouds/filesystem/util/internal/FileSystemBlobUtilsImpl.java @@ -17,13 +17,14 @@ * ==================================================================== */ -package org.jclouds.filesystem.utils; +package org.jclouds.filesystem.util.internal; import com.google.inject.Inject; import org.jclouds.blobstore.AsyncBlobStore; import org.jclouds.blobstore.domain.Blob; import org.jclouds.blobstore.options.ListContainerOptions; import org.jclouds.blobstore.util.BlobUtils; +import org.jclouds.filesystem.strategy.FilesystemStorageStrategy; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java b/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java index 9e2306da48..e98f8614e7 100644 --- a/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java +++ b/filesystem/src/test/java/org/jclouds/filesystem/FilesystemAsyncBlobStoreTest.java @@ -19,8 +19,8 @@ package org.jclouds.filesystem; +import org.jclouds.filesystem.reference.FilesystemConstants; import org.jclouds.filesystem.utils.TestUtils; -import org.jclouds.filesystem.config.FilesystemConstants; import com.google.inject.CreationException; import org.jclouds.blobstore.options.GetOptions; import java.util.Iterator; diff --git a/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java b/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java index a95c31d295..a0561deacb 100644 --- a/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java +++ b/filesystem/src/test/java/org/jclouds/filesystem/integration/FilesystemTestInitializer.java @@ -30,7 +30,8 @@ import org.jclouds.logging.log4j.config.Log4JLoggingModule; import com.google.common.collect.ImmutableSet; import com.google.inject.Module; -import org.jclouds.filesystem.config.FilesystemConstants; + +import org.jclouds.filesystem.reference.FilesystemConstants; import org.jclouds.filesystem.utils.TestUtils; /** diff --git a/filesystem/src/test/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImplTest.java b/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java similarity index 98% rename from filesystem/src/test/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImplTest.java rename to filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java index a13f3b6c74..6ea8a57545 100644 --- a/filesystem/src/test/java/org/jclouds/filesystem/utils/FilesystemStorageStrategyImplTest.java +++ b/filesystem/src/test/java/org/jclouds/filesystem/strategy/internal/FilesystemStorageStrategyImplTest.java @@ -17,7 +17,7 @@ * ==================================================================== */ -package org.jclouds.filesystem.utils; +package org.jclouds.filesystem.strategy.internal; import java.util.List; import java.util.Set; @@ -33,6 +33,9 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import org.jclouds.blobstore.options.ListContainerOptions; +import org.jclouds.filesystem.strategy.FilesystemStorageStrategy; +import org.jclouds.filesystem.strategy.internal.FilesystemStorageStrategyImpl; +import org.jclouds.filesystem.utils.TestUtils; import org.jclouds.io.payloads.FilePayload; import org.testng.annotations.*;