You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2013/11/19 23:37:25 UTC
git commit: remove addl whitespace pointed out in JCLOUDS-331
Updated Branches:
refs/heads/master 9a7336bb0 -> 3ecbf9084
remove addl whitespace pointed out in JCLOUDS-331
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3ecbf908
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3ecbf908
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3ecbf908
Branch: refs/heads/master
Commit: 3ecbf9084762ef4c8b0f8c5beb8a161add1fb6bd
Parents: 9a7336b
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Nov 19 15:23:21 2013 +0000
Committer: Andrew Phillips <an...@apache.org>
Committed: Tue Nov 19 17:37:02 2013 -0500
----------------------------------------------------------------------
.../jclouds/ec2/compute/EC2TemplateBuilderTest.java | 2 +-
.../compute/internal/EC2TemplateBuilderImplTest.java | 2 +-
.../org/jclouds/compute/domain/TemplateBuilder.java | 2 +-
.../compute/domain/internal/TemplateBuilderImpl.java | 2 +-
.../domain/internal/TemplateBuilderImplTest.java | 14 +++++++-------
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3ecbf908/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
index 06fcf85..1adffab 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
@@ -86,7 +86,7 @@ public class EC2TemplateBuilderTest {
.parent(provider).build();
public static final Hardware CC1_4XLARGE = cc1_4xlarge().supportsImageIds(ImmutableSet.of("us-east-1/cc-image"))
- .build();
+ .build();
/**
* Verifies that {@link TemplateBuilderImpl} would choose the correct size of the instance, based
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3ecbf908/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java
index 0b12bb0..8e11036 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java
@@ -95,7 +95,7 @@ public class EC2TemplateBuilderImplTest extends TemplateBuilderImplTest {
protected String getProviderFormatId(String uniqueLabel) {
return "us-east-1/"+uniqueLabel;
}
-
+
@Override
@Test
public void testHardwareWithImageIdPredicateOnlyAcceptsImageWhenLocationNull() {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3ecbf908/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
index 155dbdc..2f5f2f0 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
@@ -178,7 +178,7 @@ public interface TemplateBuilder {
* This strategy may change from version to version.
*/
TemplateBuilder imageChooser(Function<Iterable<? extends Image>, Image> imageChooser);
-
+
/**
* Configure this template to require the minimum cores below
*/
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3ecbf908/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
index 426511f..f89f3f5 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
@@ -505,7 +505,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
Ordering.<String> natural().nullsLast()).result();
}
};
-
+
@VisibleForTesting
// non-static for logging
final Function<Iterable<? extends Image>, Image> imageChooserFromOrdering(final Ordering<Image> ordering) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3ecbf908/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
index 8419a85..eb24854 100644
--- a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
+++ b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
@@ -88,12 +88,12 @@ public class TemplateBuilderImplTest {
Iterable<String> values = Arrays.asList("1", "3", null, "2", "2");
assertEquals(TemplateBuilderImpl.multiMax(Ordering.natural().nullsLast(), values), Arrays.asList((Object)null));
}
-
+
public void testMultiMaxNulls() {
Iterable<String> values = Arrays.asList("1", "3", null, "2", "2", null);
assertEquals(TemplateBuilderImpl.multiMax(Ordering.natural().nullsLast(), values), Arrays.asList((Object)null, null));
}
-
+
protected Location provider = new LocationBuilder().scope(LocationScope.PROVIDER).id("aws-ec2").description("aws-ec2").build();
protected Location region = new LocationBuilder().scope(LocationScope.REGION).id("us-east-1")
@@ -115,13 +115,13 @@ public class TemplateBuilderImplTest {
protected Image image64bit = ImageBuilder.fromImage(image).id(getProviderFormatId("image64bId")).providerId("image64bId")
.operatingSystem(os.toBuilder().arch("X86_64").build()).build();
-
+
protected Image imageArchNull = ImageBuilder.fromImage(image).id(getProviderFormatId("imageArchNullId")).providerId("imageArchNullId")
.operatingSystem(os.toBuilder().arch(null).build()).build();
-
+
protected Image imageNameAlt = ImageBuilder.fromImage(image).id(getProviderFormatId("imageNameAltId")).providerId("imageNameAltId")
.name("alternateImageName").build();
-
+
@SuppressWarnings("unchecked")
public void testLocationPredicateWhenComputeMetadataIsNotLocationBound() {
@@ -189,7 +189,7 @@ public class TemplateBuilderImplTest {
Suppliers.<Set<? extends Image>> ofInstance(ImmutableSet.<Image> of(image, image64bit)),
image64bit);
}
-
+
public void testResolveImagesPrefersNull() {
// preferring null has been the default behaviour; not sure if this is ideal
// (would make more sense to prefer nonNull) but don't change behaviour by default
@@ -214,7 +214,7 @@ public class TemplateBuilderImplTest {
};
assertTrue(TemplateBuilderImpl.DEFAULT_IMAGE_ORDERING.compare(image64bit, imageArchNull) < 0, "wrong default image ordering");
assertTrue(sorterPreferringNonNullArch.compare(image64bit, imageArchNull) > 0, "wrong custom image ordering");
-
+
Function<TemplateBuilderImpl, TemplateBuilderImpl> tbCustomiser = new Function<TemplateBuilderImpl, TemplateBuilderImpl>() {
@Override
public TemplateBuilderImpl apply(TemplateBuilderImpl input) {