Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove addl whitespace pointed out in JCLOUDS-331

This commit is contained in:
Alex Heneveld 2013-11-19 15:23:21 +00:00 committed by Andrew Phillips
parent 9a7336bb0e
commit 3ecbf90847
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2TemplateBuilderTest.java
View File

@ -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

2
apis/ec2/src/test/java/org/jclouds/ec2/compute/internal/EC2TemplateBuilderImplTest.java
View File

@ -95,7 +95,7 @@ public class EC2TemplateBuilderImplTest extends TemplateBuilderImplTest {
protected String getProviderFormatId(String uniqueLabel) {
return "us-east-1/"+uniqueLabel;
}
@Override
@Test
public void testHardwareWithImageIdPredicateOnlyAcceptsImageWhenLocationNull() {

2
compute/src/main/java/org/jclouds/compute/domain/TemplateBuilder.java
View File

@ -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
*/

2
compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
View File

@ -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) {

14
compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
View File

@ -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) {