Remove class PeerInfoProvider
That class is returning the proper provider based on the config.
Instead, bind the proper provider directly in the module.
Change-Id: I783f413ee06e1cd97e7cdfc5ca89e0f189e7c99a
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java
index 25e0c41..577d66d 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoModule.java
@@ -30,9 +30,17 @@
@Override
protected void configure() {
- bind(new TypeLiteral<Optional<PeerInfo>>() {}).toProvider(PeerInfoProvider.class);
- if (strategy == Configuration.PeerInfoStrategy.JGROUPS) {
- listener().to(JGroupsPeerInfoProvider.class);
+ switch (strategy) {
+ case STATIC:
+ bind(new TypeLiteral<Optional<PeerInfo>>() {})
+ .toProvider(PluginConfigPeerInfoProvider.class);
+ break;
+ case JGROUPS:
+ bind(new TypeLiteral<Optional<PeerInfo>>() {}).toProvider(JGroupsPeerInfoProvider.class);
+ listener().to(JGroupsPeerInfoProvider.class);
+ break;
+ default:
+ throw new IllegalArgumentException("Unsupported peer info strategy: " + strategy);
}
}
}
diff --git a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoProvider.java b/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoProvider.java
deleted file mode 100644
index 2649f50..0000000
--- a/src/main/java/com/ericsson/gerrit/plugins/highavailability/peers/PeerInfoProvider.java
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (C) 2017 The Android Open Source Project
-//
-// Licensed 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 com.ericsson.gerrit.plugins.highavailability.peers;
-
-import com.ericsson.gerrit.plugins.highavailability.Configuration;
-import com.ericsson.gerrit.plugins.highavailability.Configuration.PeerInfoStrategy;
-import com.ericsson.gerrit.plugins.highavailability.peers.jgroups.JGroupsPeerInfoProvider;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
-import com.google.inject.Singleton;
-import java.util.Optional;
-
-@Singleton
-public class PeerInfoProvider implements Provider<Optional<PeerInfo>> {
-
- private final Provider<Optional<PeerInfo>> configuredProvider;
-
- @Inject
- PeerInfoProvider(Injector injector, Configuration cfg) {
- PeerInfoStrategy strategy = cfg.peerInfo().strategy();
- switch (strategy) {
- case STATIC:
- configuredProvider = injector.getInstance(PluginConfigPeerInfoProvider.class);
- break;
- case JGROUPS:
- configuredProvider = injector.getInstance(JGroupsPeerInfoProvider.class);
- break;
- default:
- throw new IllegalArgumentException("Unsupported peer info strategy: " + strategy);
- }
- }
-
- @Override
- public Optional<PeerInfo> get() {
- return configuredProvider.get();
- }
-}
