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 2015/09/03 00:43:17 UTC
[3/3] jclouds git commit: JCLOUDS-962: Do not override provider
methods
JCLOUDS-962: Do not override provider methods
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/6cd716f1
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6cd716f1
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6cd716f1
Branch: refs/heads/master
Commit: 6cd716f1eaefce26b95d5e147eff90477f82def0
Parents: d45f08e
Author: Oliver Gondža <og...@gmail.com>
Authored: Thu Jul 16 20:41:37 2015 +0200
Committer: Ignasi Barrera <na...@apache.org>
Committed: Wed Sep 2 23:54:44 2015 +0200
----------------------------------------------------------------------
.../compute/config/BaseComputeServiceContextModule.java | 12 ++++++++++--
.../java/org/jclouds/logging/config/LoggingModule.java | 5 ++++-
2 files changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6cd716f1/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
index d4498f6..5336f44 100644
--- a/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
+++ b/compute/src/main/java/org/jclouds/compute/config/BaseComputeServiceContextModule.java
@@ -300,15 +300,23 @@ public abstract class BaseComputeServiceContextModule extends AbstractModule {
}
};
}
-
+
@Provides
@Singleton
+ public final Optional<ImageExtension> guiceProvideImageExtension(Injector i) {
+ return provideImageExtension(i);
+ }
+
protected Optional<ImageExtension> provideImageExtension(Injector i) {
return Optional.absent();
}
-
+
@Provides
@Singleton
+ protected Optional<SecurityGroupExtension> guiceProvideSecurityGroupExtension(Injector i)
+ return provideSecurityGroupExtension(i);
+ }
+
protected Optional<SecurityGroupExtension> provideSecurityGroupExtension(Injector i) {
return Optional.absent();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6cd716f1/core/src/main/java/org/jclouds/logging/config/LoggingModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/logging/config/LoggingModule.java b/core/src/main/java/org/jclouds/logging/config/LoggingModule.java
index ad47bd1..1d791a2 100644
--- a/core/src/main/java/org/jclouds/logging/config/LoggingModule.java
+++ b/core/src/main/java/org/jclouds/logging/config/LoggingModule.java
@@ -37,6 +37,9 @@ public abstract class LoggingModule extends AbstractModule {
@Provides
@Singleton
- public abstract Logger.LoggerFactory createLoggerFactory();
+ public final Logger.LoggerFactory provideLoggerFactory() {
+ return createLoggerFactory();
+ }
+ public abstract Logger.LoggerFactory createLoggerFactory();
}