From 6cd716f1eaefce26b95d5e147eff90477f82def0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20Gond=C5=BEa?= Date: Thu, 16 Jul 2015 20:41:37 +0200 Subject: [PATCH] JCLOUDS-962: Do not override provider methods --- .../config/BaseComputeServiceContextModule.java | 12 ++++++++++-- .../org/jclouds/logging/config/LoggingModule.java | 5 ++++- 2 files changed, 14 insertions(+), 3 deletions(-) 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 d4498f6e35..5336f4450a 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 guiceProvideImageExtension(Injector i) { + return provideImageExtension(i); + } + protected Optional provideImageExtension(Injector i) { return Optional.absent(); } - + @Provides @Singleton + protected Optional guiceProvideSecurityGroupExtension(Injector i) + return provideSecurityGroupExtension(i); + } + protected Optional provideSecurityGroupExtension(Injector i) { return Optional.absent(); } 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 ad47bd11da..1d791a24fb 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(); }