Repository: jclouds-labs Updated Branches: refs/heads/1.7.x 9e667985b -> 17dd11590
Improved error messages in preconditions and addressed checkstyle violations Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/17dd1159 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/17dd1159 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/17dd1159 Branch: refs/heads/1.7.x Commit: 17dd11590819c7404fc8f42c0b5ad89f4bb75a92 Parents: 9e66798 Author: Ignasi Barrera <[email protected]> Authored: Fri May 30 12:16:35 2014 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Mon Jun 2 14:19:31 2014 +0200 ---------------------------------------------------------------------- .../functions/TemplateOptionsToStatementWithoutPublicKey.java | 2 -- .../jclouds/digitalocean/compute/util/LocationNamingUtils.java | 6 ++++-- .../jclouds/digitalocean/config/DigitalOceanHttpApiModule.java | 1 - .../digitalocean/handlers/DigitalOceanErrorHandler.java | 1 - .../src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java | 3 --- .../compute/DigitalOceanComputeServiceLiveTest.java | 1 - .../compute/DigitalOceanImageExtensionLiveTest.java | 1 - .../digitalocean/compute/util/LocationNamingUtilsTest.java | 4 ++-- 8 files changed, 6 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/main/java/org/jclouds/digitalocean/compute/functions/TemplateOptionsToStatementWithoutPublicKey.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/functions/TemplateOptionsToStatementWithoutPublicKey.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/functions/TemplateOptionsToStatementWithoutPublicKey.java index 7eb9013..1a01811 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/functions/TemplateOptionsToStatementWithoutPublicKey.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/functions/TemplateOptionsToStatementWithoutPublicKey.java @@ -20,8 +20,6 @@ import javax.inject.Singleton; import org.jclouds.compute.functions.TemplateOptionsToStatement; import org.jclouds.compute.options.TemplateOptions; -import org.jclouds.digitalocean.compute.strategy.DigitalOceanComputeServiceAdapter; -import org.jclouds.digitalocean.features.KeyPairApi; import org.jclouds.scriptbuilder.InitScript; import org.jclouds.scriptbuilder.domain.Statement; import org.jclouds.scriptbuilder.domain.StatementList; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java index abbf4dc..bca8e9c 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/util/LocationNamingUtils.java @@ -39,7 +39,8 @@ public class LocationNamingUtils { checkNotNull(location, "location cannot be null"); String regionIdAndName = location.getDescription(); int index = regionIdAndName.indexOf('/'); - checkArgument(index >= 0, "location description should be in the form 'regionId/regionName'"); + checkArgument(index >= 0, "location description should be in the form 'regionId/regionName' but was: %s", + regionIdAndName); return Integer.parseInt(regionIdAndName.substring(0, index)); } @@ -53,7 +54,8 @@ public class LocationNamingUtils { checkNotNull(location, "location cannot be null"); String regionIdAndName = location.getDescription(); int index = regionIdAndName.indexOf('/'); - checkArgument(index >= 0, "location description should be in the form 'regionId/regionName'"); + checkArgument(index >= 0, "location description should be in the form 'regionId/regionName' but was: %s", + regionIdAndName); return regionIdAndName.substring(index + 1); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/main/java/org/jclouds/digitalocean/config/DigitalOceanHttpApiModule.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/config/DigitalOceanHttpApiModule.java b/digitalocean/src/main/java/org/jclouds/digitalocean/config/DigitalOceanHttpApiModule.java index 5636a90..9feb72c 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/config/DigitalOceanHttpApiModule.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/config/DigitalOceanHttpApiModule.java @@ -55,7 +55,6 @@ public class DigitalOceanHttpApiModule extends HttpApiModule<DigitalOceanApi> { install(new SSLModule()); bind(HttpCommandExecutorService.class).to(ResponseStatusFromPayloadHttpCommandExecutorService.class).in( Scopes.SINGLETON); - ; } } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/main/java/org/jclouds/digitalocean/handlers/DigitalOceanErrorHandler.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/handlers/DigitalOceanErrorHandler.java b/digitalocean/src/main/java/org/jclouds/digitalocean/handlers/DigitalOceanErrorHandler.java index 460790c..3c8ec70 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/handlers/DigitalOceanErrorHandler.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/handlers/DigitalOceanErrorHandler.java @@ -18,7 +18,6 @@ package org.jclouds.digitalocean.handlers; import javax.inject.Singleton; -import org.jclouds.digitalocean.http.ResponseStatusFromPayloadHttpCommandExecutorService; import org.jclouds.http.HttpCommand; import org.jclouds.http.HttpErrorHandler; import org.jclouds.http.HttpResponse; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java b/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java index 1f7dbc8..3d65d87 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java @@ -35,9 +35,6 @@ import java.security.interfaces.DSAParams; import java.security.interfaces.DSAPublicKey; import java.security.spec.DSAPublicKeySpec; -import org.jclouds.crypto.Pems; -import org.jclouds.ssh.SshKeys; - import com.google.common.base.Charsets; import com.google.common.base.Splitter; import com.google.common.hash.HashCode; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanComputeServiceLiveTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanComputeServiceLiveTest.java index 7def79a..ff4a3d2 100644 --- a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanComputeServiceLiveTest.java +++ b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanComputeServiceLiveTest.java @@ -16,7 +16,6 @@ */ package org.jclouds.digitalocean.compute; -import org.jclouds.compute.ComputeService; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.internal.BaseComputeServiceLiveTest; import org.jclouds.sshj.config.SshjSshClientModule; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanImageExtensionLiveTest.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanImageExtensionLiveTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanImageExtensionLiveTest.java index 313ed3e..fde0366 100644 --- a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanImageExtensionLiveTest.java +++ b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/DigitalOceanImageExtensionLiveTest.java @@ -16,7 +16,6 @@ */ package org.jclouds.digitalocean.compute; -import org.jclouds.compute.extensions.ImageExtension; import org.jclouds.compute.extensions.internal.BaseImageExtensionLiveTest; import org.jclouds.sshj.config.SshjSshClientModule; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/17dd1159/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java index 4f5ec06..724f0ad 100644 --- a/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java +++ b/digitalocean/src/test/java/org/jclouds/digitalocean/compute/util/LocationNamingUtilsTest.java @@ -55,7 +55,7 @@ public class LocationNamingUtilsTest { extractRegionId(null); } - @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName'") + @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName' but was: foobar") public void testExtractRegionIdWithoutEncodedForm() { extractRegionId(location("foobar")); } @@ -79,7 +79,7 @@ public class LocationNamingUtilsTest { extractRegionId(null); } - @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName'") + @Test(expectedExceptions = IllegalArgumentException.class, expectedExceptionsMessageRegExp = "location description should be in the form 'regionId/regionName' but was: foobar") public void testExtractRegionNameWithoutEncodedForm() { extractRegionId(location("foobar")); }
