JCLOUDS-1005: Correct B2 package names Addresses javadoc failures.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/26d85068 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/26d85068 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/26d85068 Branch: refs/heads/master Commit: 26d85068ca215ed4ae42d9dcb3ea6bdd9f5a31cb Parents: bd3bbc4 Author: Andrew Gaul <[email protected]> Authored: Wed Jun 1 15:18:16 2016 -0700 Committer: Andrew Gaul <[email protected]> Committed: Wed Jun 1 15:18:16 2016 -0700 ---------------------------------------------------------------------- providers/b2/src/main/java/org/jclouds/b2/B2Api.java | 6 +++--- .../b2/src/main/java/org/jclouds/b2/B2ApiMetadata.java | 4 ++-- .../src/main/java/org/jclouds/b2/B2ProviderMetadata.java | 2 +- .../src/main/java/org/jclouds/b2/B2ResponseException.java | 4 ++-- .../main/java/org/jclouds/b2/config/B2HttpApiModule.java | 10 +++++----- .../main/java/org/jclouds/b2/domain/Authorization.java | 2 +- .../b2/src/main/java/org/jclouds/b2/domain/B2Error.java | 2 +- .../b2/src/main/java/org/jclouds/b2/domain/Bucket.java | 2 +- .../src/main/java/org/jclouds/b2/domain/BucketList.java | 2 +- .../src/main/java/org/jclouds/b2/domain/BucketType.java | 2 +- .../java/org/jclouds/b2/features/AuthorizationApi.java | 4 ++-- .../src/main/java/org/jclouds/b2/features/BucketApi.java | 10 +++++----- .../java/org/jclouds/b2/filters/RequestAuthorization.java | 4 ++-- .../jclouds/b2/handlers/ParseB2ErrorFromJsonContent.java | 6 +++--- .../test/java/org/jclouds/b2/B2ProviderMetadataTest.java | 2 +- .../java/org/jclouds/b2/features/BucketApiLiveTest.java | 10 +++++----- .../java/org/jclouds/b2/features/BucketApiMockTest.java | 10 +++++----- .../java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java | 6 +++--- 18 files changed, 44 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/B2Api.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/B2Api.java b/providers/b2/src/main/java/org/jclouds/b2/B2Api.java index caa8f98..19419b5 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/B2Api.java +++ b/providers/b2/src/main/java/org/jclouds/b2/B2Api.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2; +package org.jclouds.b2; import java.io.Closeable; -import org.jclouds.labs.b2.features.AuthorizationApi; -import org.jclouds.labs.b2.features.BucketApi; +import org.jclouds.b2.features.AuthorizationApi; +import org.jclouds.b2.features.BucketApi; import org.jclouds.rest.annotations.Delegate; /** Provides access to Backblaze B2 resources via their REST API. */ http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/B2ApiMetadata.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/B2ApiMetadata.java b/providers/b2/src/main/java/org/jclouds/b2/B2ApiMetadata.java index 16c4176..ef2e715 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/B2ApiMetadata.java +++ b/providers/b2/src/main/java/org/jclouds/b2/B2ApiMetadata.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2; +package org.jclouds.b2; import static org.jclouds.reflect.Reflection2.typeToken; @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.jclouds.Constants; import org.jclouds.apis.ApiMetadata; import org.jclouds.blobstore.BlobStoreContext; -import org.jclouds.labs.b2.config.B2HttpApiModule; +import org.jclouds.b2.config.B2HttpApiModule; import org.jclouds.rest.internal.BaseHttpApiMetadata; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/B2ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/B2ProviderMetadata.java b/providers/b2/src/main/java/org/jclouds/b2/B2ProviderMetadata.java index 037fd9f..b2a63b8 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/B2ProviderMetadata.java +++ b/providers/b2/src/main/java/org/jclouds/b2/B2ProviderMetadata.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2; +package org.jclouds.b2; import java.util.Properties; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/B2ResponseException.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/B2ResponseException.java b/providers/b2/src/main/java/org/jclouds/b2/B2ResponseException.java index 9ab60ed..3e89359 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/B2ResponseException.java +++ b/providers/b2/src/main/java/org/jclouds/b2/B2ResponseException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2; +package org.jclouds.b2; -import org.jclouds.labs.b2.domain.B2Error; +import org.jclouds.b2.domain.B2Error; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpResponse; import org.jclouds.http.HttpResponseException; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java b/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java index a266d31..11d8624 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java +++ b/providers/b2/src/main/java/org/jclouds/b2/config/B2HttpApiModule.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.config; +package org.jclouds.b2.config; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; @@ -24,10 +24,10 @@ import javax.inject.Singleton; import org.jclouds.Constants; import org.jclouds.collect.Memoized; -import org.jclouds.labs.b2.B2Api; -import org.jclouds.labs.b2.domain.Authorization; -import org.jclouds.labs.b2.filters.RequestAuthorization; -import org.jclouds.labs.b2.handlers.ParseB2ErrorFromJsonContent; +import org.jclouds.b2.B2Api; +import org.jclouds.b2.domain.Authorization; +import org.jclouds.b2.filters.RequestAuthorization; +import org.jclouds.b2.handlers.ParseB2ErrorFromJsonContent; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.annotation.ClientError; import org.jclouds.http.annotation.Redirection; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/domain/Authorization.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/domain/Authorization.java b/providers/b2/src/main/java/org/jclouds/b2/domain/Authorization.java index d95d028..9193673 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/domain/Authorization.java +++ b/providers/b2/src/main/java/org/jclouds/b2/domain/Authorization.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.domain; +package org.jclouds.b2.domain; import org.jclouds.json.SerializedNames; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/domain/B2Error.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/domain/B2Error.java b/providers/b2/src/main/java/org/jclouds/b2/domain/B2Error.java index a17ecb9..c4d16a9 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/domain/B2Error.java +++ b/providers/b2/src/main/java/org/jclouds/b2/domain/B2Error.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.domain; +package org.jclouds.b2.domain; import org.jclouds.json.SerializedNames; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/domain/Bucket.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/domain/Bucket.java b/providers/b2/src/main/java/org/jclouds/b2/domain/Bucket.java index 6aff182..e9556ef 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/domain/Bucket.java +++ b/providers/b2/src/main/java/org/jclouds/b2/domain/Bucket.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.domain; +package org.jclouds.b2.domain; import org.jclouds.json.SerializedNames; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/domain/BucketList.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/domain/BucketList.java b/providers/b2/src/main/java/org/jclouds/b2/domain/BucketList.java index 4be4596..827cdb8 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/domain/BucketList.java +++ b/providers/b2/src/main/java/org/jclouds/b2/domain/BucketList.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.domain; +package org.jclouds.b2.domain; import java.util.List; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/domain/BucketType.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/domain/BucketType.java b/providers/b2/src/main/java/org/jclouds/b2/domain/BucketType.java index 61b0481..abcee1f 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/domain/BucketType.java +++ b/providers/b2/src/main/java/org/jclouds/b2/domain/BucketType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.domain; +package org.jclouds.b2.domain; import com.google.common.base.CaseFormat; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java index 9789541..c232e47 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/AuthorizationApi.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.features; +package org.jclouds.b2.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; @@ -24,7 +24,7 @@ import javax.ws.rs.GET; import javax.ws.rs.Path; import org.jclouds.http.filters.BasicAuthentication; -import org.jclouds.labs.b2.domain.Authorization; +import org.jclouds.b2.domain.Authorization; import org.jclouds.rest.annotations.RequestFilters; public interface AuthorizationApi { http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java b/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java index 6b341bd..2e6d5de 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java +++ b/providers/b2/src/main/java/org/jclouds/b2/features/BucketApi.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.features; +package org.jclouds.b2.features; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; @@ -28,10 +28,10 @@ import javax.ws.rs.Produces; import org.jclouds.Fallbacks.NullOnNotFoundOr404; import org.jclouds.blobstore.attr.BlobScope; -import org.jclouds.labs.b2.domain.Bucket; -import org.jclouds.labs.b2.domain.BucketList; -import org.jclouds.labs.b2.domain.BucketType; -import org.jclouds.labs.b2.filters.RequestAuthorization; +import org.jclouds.b2.domain.Bucket; +import org.jclouds.b2.domain.BucketList; +import org.jclouds.b2.domain.BucketType; +import org.jclouds.b2.filters.RequestAuthorization; import org.jclouds.rest.annotations.Fallback; import org.jclouds.rest.annotations.MapBinder; import org.jclouds.rest.annotations.PayloadParam; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java index ce54199..e65593d 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java +++ b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.filters; +package org.jclouds.b2.filters; import java.net.URI; @@ -26,7 +26,7 @@ import org.jclouds.domain.Credentials; import org.jclouds.http.HttpException; import org.jclouds.http.HttpRequest; import org.jclouds.http.HttpRequestFilter; -import org.jclouds.labs.b2.domain.Authorization; +import org.jclouds.b2.domain.Authorization; import org.jclouds.location.Provider; import com.google.common.base.Supplier; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/main/java/org/jclouds/b2/handlers/ParseB2ErrorFromJsonContent.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/main/java/org/jclouds/b2/handlers/ParseB2ErrorFromJsonContent.java b/providers/b2/src/main/java/org/jclouds/b2/handlers/ParseB2ErrorFromJsonContent.java index f042478..b48760c 100644 --- a/providers/b2/src/main/java/org/jclouds/b2/handlers/ParseB2ErrorFromJsonContent.java +++ b/providers/b2/src/main/java/org/jclouds/b2/handlers/ParseB2ErrorFromJsonContent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.handlers; +package org.jclouds.b2.handlers; import org.jclouds.blobstore.ContainerNotFoundException; import org.jclouds.http.HttpCommand; @@ -22,8 +22,8 @@ import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.HttpResponse; import org.jclouds.http.functions.ParseJson; import org.jclouds.json.Json; -import org.jclouds.labs.b2.B2ResponseException; -import org.jclouds.labs.b2.domain.B2Error; +import org.jclouds.b2.B2ResponseException; +import org.jclouds.b2.domain.B2Error; import com.google.inject.Inject; import com.google.inject.TypeLiteral; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/test/java/org/jclouds/b2/B2ProviderMetadataTest.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/test/java/org/jclouds/b2/B2ProviderMetadataTest.java b/providers/b2/src/test/java/org/jclouds/b2/B2ProviderMetadataTest.java index 91c2f1a..fc142ca 100644 --- a/providers/b2/src/test/java/org/jclouds/b2/B2ProviderMetadataTest.java +++ b/providers/b2/src/test/java/org/jclouds/b2/B2ProviderMetadataTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2; +package org.jclouds.b2; import org.jclouds.providers.internal.BaseProviderMetadataTest; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiLiveTest.java b/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiLiveTest.java index 46db59f..81e6ceb 100644 --- a/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiLiveTest.java +++ b/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiLiveTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.features; +package org.jclouds.b2.features; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown; import java.util.Random; -import org.jclouds.labs.b2.domain.Bucket; -import org.jclouds.labs.b2.domain.BucketList; -import org.jclouds.labs.b2.domain.BucketType; -import org.jclouds.labs.b2.internal.BaseB2ApiLiveTest; +import org.jclouds.b2.domain.Bucket; +import org.jclouds.b2.domain.BucketList; +import org.jclouds.b2.domain.BucketType; +import org.jclouds.b2.internal.BaseB2ApiLiveTest; import org.testng.annotations.Test; public final class BucketApiLiveTest extends BaseB2ApiLiveTest { http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiMockTest.java b/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiMockTest.java index 35c4188..09eb58a 100644 --- a/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiMockTest.java +++ b/providers/b2/src/test/java/org/jclouds/b2/features/BucketApiMockTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.features; +package org.jclouds.b2.features; import static org.assertj.core.api.Assertions.assertThat; @@ -25,10 +25,10 @@ import java.util.Properties; import org.jclouds.ContextBuilder; import org.jclouds.concurrent.config.ExecutorServiceModule; -import org.jclouds.labs.b2.B2Api; -import org.jclouds.labs.b2.domain.Bucket; -import org.jclouds.labs.b2.domain.BucketList; -import org.jclouds.labs.b2.domain.BucketType; +import org.jclouds.b2.B2Api; +import org.jclouds.b2.domain.Bucket; +import org.jclouds.b2.domain.BucketList; +import org.jclouds.b2.domain.BucketType; import org.jclouds.util.Strings2; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds/blob/26d85068/providers/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java b/providers/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java index 59ac34a..0b8ace0 100644 --- a/providers/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java +++ b/providers/b2/src/test/java/org/jclouds/b2/internal/BaseB2ApiLiveTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.jclouds.labs.b2.internal; +package org.jclouds.b2.internal; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.BaseApiLiveTest; -import org.jclouds.labs.b2.B2Api; -import org.jclouds.labs.b2.B2ApiMetadata; +import org.jclouds.b2.B2Api; +import org.jclouds.b2.B2ApiMetadata; public class BaseB2ApiLiveTest extends BaseApiLiveTest<B2Api> { protected BaseB2ApiLiveTest() {
