You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2016/01/19 12:05:28 UTC
jclouds-labs git commit: Remove unnecessary code to register the
compute extensions
Repository: jclouds-labs
Updated Branches:
refs/heads/master 33ec40800 -> f67d2aa7b
Remove unnecessary code to register the compute extensions
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/f67d2aa7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/f67d2aa7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/f67d2aa7
Branch: refs/heads/master
Commit: f67d2aa7bfb45a6448e8a49a46d12576b4ba5aa5
Parents: 33ec408
Author: Ignasi Barrera <na...@apache.org>
Authored: Fri Nov 27 09:40:45 2015 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Jan 19 11:17:21 2016 +0100
----------------------------------------------------------------------
.../config/AzureComputeServiceContextModule.java | 15 ++++-----------
.../DigitalOcean2ComputeServiceContextModule.java | 7 -------
2 files changed, 4 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/f67d2aa7/azurecompute/src/main/java/org/jclouds/azurecompute/compute/config/AzureComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/config/AzureComputeServiceContextModule.java b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/config/AzureComputeServiceContextModule.java
index 1e07798..9eb689d 100644
--- a/azurecompute/src/main/java/org/jclouds/azurecompute/compute/config/AzureComputeServiceContextModule.java
+++ b/azurecompute/src/main/java/org/jclouds/azurecompute/compute/config/AzureComputeServiceContextModule.java
@@ -22,6 +22,8 @@ import static org.jclouds.azurecompute.config.AzureComputeProperties.OPERATION_T
import static org.jclouds.azurecompute.config.AzureComputeProperties.TCP_RULE_FORMAT;
import static org.jclouds.azurecompute.config.AzureComputeProperties.TCP_RULE_REGEXP;
+import java.util.concurrent.TimeUnit;
+
import javax.inject.Named;
import javax.inject.Singleton;
@@ -40,6 +42,7 @@ import org.jclouds.azurecompute.domain.Location;
import org.jclouds.azurecompute.domain.OSImage;
import org.jclouds.azurecompute.domain.RoleSize;
import org.jclouds.azurecompute.options.AzureComputeTemplateOptions;
+import org.jclouds.azurecompute.util.ConflictManagementPredicate;
import org.jclouds.compute.ComputeServiceAdapter;
import org.jclouds.compute.config.ComputeServiceAdapterContextModule;
import org.jclouds.compute.domain.Hardware;
@@ -47,20 +50,15 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.extensions.SecurityGroupExtension;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.compute.strategy.CreateNodesInGroupThenAddToSet;
-import org.jclouds.compute.strategy.impl.AdaptingComputeServiceStrategies;
import org.jclouds.compute.strategy.PrioritizeCredentialsFromTemplate;
+import org.jclouds.compute.strategy.impl.AdaptingComputeServiceStrategies;
import com.google.common.base.Function;
-import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.inject.Inject;
-import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
-import java.util.concurrent.TimeUnit;
-import org.jclouds.azurecompute.util.ConflictManagementPredicate;
-
public class AzureComputeServiceContextModule
extends ComputeServiceAdapterContextModule<Deployment, RoleSize, OSImage, Location> {
@@ -94,11 +92,6 @@ public class AzureComputeServiceContextModule
});
}
- @Override
- protected Optional<SecurityGroupExtension> provideSecurityGroupExtension(final Injector injector) {
- return Optional.of(injector.getInstance(SecurityGroupExtension.class));
- }
-
@Provides
@Singleton
protected Predicate<String> provideOperationSucceededPredicate(
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/f67d2aa7/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java b/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java
index 7159634..03caf85 100644
--- a/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java
+++ b/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/config/DigitalOcean2ComputeServiceContextModule.java
@@ -57,9 +57,7 @@ import org.jclouds.domain.Location;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Optional;
import com.google.common.base.Predicate;
-import com.google.inject.Injector;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
import com.google.inject.name.Named;
@@ -99,11 +97,6 @@ public class DigitalOcean2ComputeServiceContextModule extends
}).to(DigitalOcean2ImageExtension.class);
}
- @Override
- protected Optional<ImageExtension> provideImageExtension(Injector i) {
- return Optional.of(i.getInstance(ImageExtension.class));
- }
-
@Provides
@Named(TIMEOUT_NODE_RUNNING)
protected Predicate<Integer> provideDropletRunningPredicate(final DigitalOcean2Api api, Timeouts timeouts,