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

Fixed an overzealous refactor.

This commit is contained in:
Chris Custine 2011-03-13 23:08:38 -06:00
parent cdd1636514
commit f5e479a4b5
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apis/chef/src/main/java/org/jclouds/ohai/OhaiContextBuilder.java
View File

@ -19,22 +19,24 @@
package org.jclouds.ohai;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.inject.Module;
import org.jclouds.compute.ComputeServiceContextBuilder;
import java.util.Properties;
import javax.inject.Inject;
import org.jclouds.ohai.config.ConfiguresOhai;
import org.jclouds.ohai.config.JMXOhaiModule;
import org.jclouds.rest.RestContext;
import org.jclouds.rest.RestContextBuilder;
import javax.inject.Inject;
import java.util.Properties;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.inject.Module;
/**
*
* @see RestContext
*/
public class OhaiContextBuilder<S, A> extends ComputeServiceContextBuilder<S, A> {
public class OhaiContextBuilder<S, A> extends RestContextBuilder<S, A> {
@Inject
public OhaiContextBuilder(Class<S> syncClientClass, Class<A> asyncClientClass, Properties properties) {
@ -56,4 +58,4 @@ public class OhaiContextBuilder<S, A> extends ComputeServiceContextBuilder<S, A>
modules.add(new JMXOhaiModule());
}
}
}

4
apis/chef/src/test/java/org/jclouds/chef/ProvidersInPropertiesTest.java
View File

@ -20,7 +20,7 @@
package org.jclouds.chef;
import com.google.common.collect.Iterables;
import org.jclouds.compute.util.ComputeServiceUtils;
import org.jclouds.rest.Providers;
import org.testng.annotations.Test;
/**
@ -33,7 +33,7 @@ public class ProvidersInPropertiesTest {
@Test
public void testSupportedProviders() {
Iterable<String> providers = ComputeServiceUtils.getSupportedProviders();
Iterable<String> providers = Providers.getSupportedProviders();
assert Iterables.contains(providers, "chef") : providers;
}