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

Merge pull request #1129 from jclouds/no-transformingset 

removed TransformingSetSupplier as it is replaced with FluentIterable
This commit is contained in:
Adrian Cole 2012-12-31 22:06:18 -08:00
parent 955b3a3f85 b19e4a7a0f
commit d9164ddcbd
3 changed files with 35 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java
View File

@ -19,16 +19,14 @@
package org.jclouds.compute.config;
import static com.google.common.base.Functions.compose;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Predicates.notNull;
import static com.google.common.collect.Iterables.filter;
import static com.google.common.collect.Iterables.transform;
import java.util.Set;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.jclouds.collect.TransformingSetSupplier;
import org.jclouds.compute.ComputeServiceAdapter;
import org.jclouds.compute.domain.Hardware;
import org.jclouds.compute.domain.Image;
@ -48,9 +46,8 @@ import org.jclouds.domain.LoginCredentials;
import org.jclouds.location.suppliers.LocationsSupplier;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.FluentIterable;
import com.google.inject.AbstractModule;
import com.google.inject.Provides;
@ -61,16 +58,20 @@ import com.google.inject.Provides;
public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeServiceContextModule {
/**
* install this, if you want to use your computeservice adapter to handle locations. Note that if
* you do this, you'll want to instantiate a subclass to prevent type erasure.
* install this, if you want to use your computeservice adapter to handle locations. Note that if you do this, you'll
* want to instantiate a subclass to prevent type erasure.
*
* ex.
*
* <pre>
* install(new LocationsFromComputeServiceAdapterModule<NodeMetadata, Hardware, Image, Location>(){});
* install(new LocationsFromComputeServiceAdapterModule&lt;NodeMetadata, Hardware, Image, Location&gt;() {
* });
* </pre>
*
* not
*
* <pre>
* install(new LocationsFromComputeServiceAdapterModule<NodeMetadata, Hardware, Image, Location>());
* install(new LocationsFromComputeServiceAdapterModule&lt;NodeMetadata, Hardware, Image, Location&gt;());
* </pre>
*/
public static class LocationsFromComputeServiceAdapterModule<N, H, I, L> extends AbstractModule {
@ -82,17 +83,15 @@ public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeS
@Provides
@Singleton
protected LocationsSupplier supplyLocationsFromComputeServiceAdapter(
final ComputeServiceAdapter<N, H, I, L> adapter, final Function<L, Location> transformer) {
final ComputeServiceAdapter<N, H, I, L> adapter, final Function<L, Location> transformer) {
return new LocationsSupplier() {
@Override
public Set<? extends Location> get() {
Iterable<L> locations = filter(adapter.listLocations(), notNull());
return ImmutableSet.<Location> copyOf(transform(locations, transformer));
return transformGuardingNull(adapter.listLocations(), transformer);
}
@Override
public String toString() {
return Objects.toStringHelper(adapter).add("method", "listLocations").toString();
return toStringHelper(adapter).add("method", "listLocations").toString();
}
};
}
@ -101,39 +100,37 @@ public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeS
@Provides
@Singleton
protected Supplier<Set<? extends Hardware>> provideHardware(final ComputeServiceAdapter<N, H, I, L> adapter,
Function<H, Hardware> transformer) {
return new TransformingSetSupplier<H, Hardware>(new Supplier<Iterable<H>>() {
final Function<H, Hardware> transformer) {
return new Supplier<Set<? extends Hardware>>() {
@Override
public Iterable<H> get() {
return adapter.listHardwareProfiles();
public Set<? extends Hardware> get() {
return transformGuardingNull(adapter.listHardwareProfiles(), transformer);
}
@Override
public String toString() {
return Objects.toStringHelper(adapter).add("method", "listHardwareProfiles").toString();
return toStringHelper(adapter).add("method", "listHardwareProfiles").toString();
}
};
}
}, transformer);
private static <F, T> Set<? extends T> transformGuardingNull(Iterable<F> from, Function<F, T> transformer) {
return FluentIterable.from(from).filter(notNull()).transform(transformer).filter(notNull()).toSet();
}
@Provides
@Singleton
protected Supplier<Set<? extends Image>> provideImages(final ComputeServiceAdapter<N, H, I, L> adapter,
Function<I, Image> transformer, AddDefaultCredentialsToImage addDefaultCredentialsToImage) {
return new TransformingSetSupplier<I, Image>(new Supplier<Iterable<I>>() {
final Function<I, Image> transformer, final AddDefaultCredentialsToImage addDefaultCredentialsToImage) {
return new Supplier<Set<? extends Image>>() {
@Override
public Iterable<I> get() {
return filter(adapter.listImages(), notNull());
public Set<? extends Image> get() {
return transformGuardingNull(adapter.listImages(), compose(addDefaultCredentialsToImage, transformer));
}
@Override
public String toString() {
return Objects.toStringHelper(adapter).add("method", "listImages").toString();
return toStringHelper(adapter).add("method", "listImages").toString();
}
}, compose(addDefaultCredentialsToImage, transformer));
};
}
@Singleton
@ -155,14 +152,14 @@ public class ComputeServiceAdapterContextModule<N, H, I, L> extends BaseComputeS
@Override
public String toString() {
return Objects.toStringHelper(this).add("credsForImage", credsForImage).toString();
return toStringHelper(this).add("credsForImage", credsForImage).toString();
}
}
@Provides
@Singleton
protected CreateNodeWithGroupEncodedIntoName defineAddNodeWithTagStrategy(
AdaptingComputeServiceStrategies<N, H, I, L> in) {
AdaptingComputeServiceStrategies<N, H, I, L> in) {
return in;
}

76
core/src/main/java/org/jclouds/collect/TransformingSetSupplier.java
View File

@ -1,76 +0,0 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.collect;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.notNull;
import java.util.Set;
import com.google.common.base.Function;
import com.google.common.base.Objects;
import com.google.common.base.Supplier;
import com.google.common.collect.FluentIterable;
/**
*
* @author Adrian Cole
*/
public class TransformingSetSupplier<F, T> implements Supplier<Set<? extends T>> {
private final Supplier<Iterable<F>> backingSupplier;
private final Function<F, T> converter;
public TransformingSetSupplier(Supplier<Iterable<F>> backingSupplier, Function<F, T> converter) {
this.backingSupplier = checkNotNull(backingSupplier, "backingSupplier");
this.converter = checkNotNull(converter, "converter");
}
@Override
public Set<? extends T> get() {
Iterable<F> original = backingSupplier.get();
return FluentIterable.from(original)
.filter(notNull())
.transform(converter)
.filter(notNull())
.toSet();
}
@Override
public int hashCode() {
return Objects.hashCode(backingSupplier, converter);
}
@Override
public boolean equals(Object obj) {
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
TransformingSetSupplier<?, ?> that = TransformingSetSupplier.class.cast(obj);
return Objects.equal(backingSupplier, that.backingSupplier) && Objects.equal(converter, that.converter);
}
@Override
public String toString() {
return Objects.toStringHelper(this).add("backingSupplier", backingSupplier).add("converter", converter).toString();
}
}

65
core/src/test/java/org/jclouds/collect/TransformingSetSupplierTest.java
View File

@ -1,65 +0,0 @@
/**
* Licensed to jclouds, Inc. (jclouds) under one or more
* contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. jclouds licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.jclouds.collect;
import static org.testng.Assert.assertEquals;
import java.util.List;
import org.testng.annotations.Test;
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Suppliers;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
/**
*
* @author Adrian Cole
*/
@Test(groups = "unit", singleThreaded = true, testName = "TransformingSetSupplierTest")
public class TransformingSetSupplierTest {
@Test
public void testTransform() {
TransformingSetSupplier<String, String> supplier = new TransformingSetSupplier<String, String>(Suppliers
.<Iterable<String>> ofInstance(ImmutableSet.of("foo")), Functions.forMap(ImmutableMap.of("foo", "bar")));
assertEquals(supplier.get(), ImmutableSet.<String> of("bar"));
}
@Test
public void testNullsNotReturnedFromSourceSupplier() {
List<String> ofNull = Lists.newArrayList();
ofNull.add(null);
TransformingSetSupplier<String, String> supplier = new TransformingSetSupplier<String, String>(Suppliers
.<Iterable<String>> ofInstance(ofNull), Functions.forMap(ImmutableMap.of("foo", "bar")));
assertEquals(supplier.get(), ImmutableSet.<String> of());
}
@SuppressWarnings("unchecked")
@Test
public void testNullsNotReturnedFromFunction() {
TransformingSetSupplier<String, String> supplier = new TransformingSetSupplier<String, String>(Suppliers
.<Iterable<String>> ofInstance(ImmutableSet.of("foo")), (Function) Functions.constant(null));
assertEquals(supplier.get(), ImmutableSet.<String> of());
}
}