From 3ecbf9084762ef4c8b0f8c5beb8a161add1fb6bd Mon Sep 17 00:00:00 2001 From: Alex Heneveld Date: Tue, 19 Nov 2013 15:23:21 +0000 Subject: [PATCH] remove addl whitespace pointed out in JCLOUDS-331 --- .../ec2/compute/EC2TemplateBuilderTest.java | 2 +- .../internal/EC2TemplateBuilderImplTest.java | 2 +- .../jclouds/compute/domain/TemplateBuilder.java | 2 +- .../domain/internal/TemplateBuilderImpl.java | 2 +- .../domain/internal/TemplateBuilderImplTest.java | 14 +++++++------- 5 files changed, 11 insertions(+), 11 deletions(-) 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 06fcf8560c..1adffabb6a 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 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 0b12bb0779..8e11036a7a 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() { 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 155dbdc262..2f5f2f09f4 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, Image> imageChooser); - + /** * Configure this template to require the minimum cores below */ 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 426511fcf0..f89f3f5e40 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. natural().nullsLast()).result(); } }; - + @VisibleForTesting // non-static for logging final Function, Image> imageChooserFromOrdering(final Ordering ordering) { 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 8419a85b74..eb24854f6f 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 values = Arrays.asList("1", "3", null, "2", "2"); assertEquals(TemplateBuilderImpl.multiMax(Ordering.natural().nullsLast(), values), Arrays.asList((Object)null)); } - + public void testMultiMaxNulls() { Iterable 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.> ofInstance(ImmutableSet. 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 tbCustomiser = new Function() { @Override public TemplateBuilderImpl apply(TemplateBuilderImpl input) {