diff options
author | Harald Musum <musum@yahooinc.com> | 2022-08-17 11:10:59 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2022-08-17 11:10:59 +0200 |
commit | 4d66c81cc07539b875b0afa5588ce6b14a695907 (patch) | |
tree | 6ba12a3cf3060c6c0488015e64a4d825452fe956 /clustercontroller-core | |
parent | 5f57dc00592552a29cdab9c535ff05b03db08a5b (diff) |
Remove duplicated code
Diffstat (limited to 'clustercontroller-core')
3 files changed, 2 insertions, 15 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java index 75c6dbe6cec..3d9bee3c694 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGenerator.java @@ -41,7 +41,6 @@ public class ClusterStateGenerator { Params() { } - // FIXME de-dupe static Map<NodeType, Integer> buildTransitionTimeMap(int distributorTransitionTimeMs, int storageTransitionTimeMs) { Map<com.yahoo.vdslib.state.NodeType, java.lang.Integer> maxTransitionTime = new TreeMap<>(); maxTransitionTime.put(com.yahoo.vdslib.state.NodeType.DISTRIBUTOR, distributorTransitionTimeMs); diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java index f8d41405e85..66669e8b481 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterFixture.java @@ -9,13 +9,10 @@ import com.yahoo.vdslib.state.NodeState; import com.yahoo.vdslib.state.NodeType; import com.yahoo.vdslib.state.State; import com.yahoo.vespa.clustercontroller.core.listeners.NodeListener; - import java.util.Collection; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.TreeMap; import static org.mockito.Mockito.mock; @@ -24,7 +21,6 @@ public class ClusterFixture { public final ContentCluster cluster; public final Distribution distribution; public final FakeTimer timer; - private final EventLogInterface eventLog; final StateChangeHandler nodeStateChangeHandler; private final ClusterStateGenerator.Params params = new ClusterStateGenerator.Params(); @@ -32,9 +28,8 @@ public class ClusterFixture { this.cluster = cluster; this.distribution = distribution; this.timer = new FakeTimer(); - this.eventLog = mock(EventLogInterface.class); var context = new FleetControllerContextImpl(new FleetControllerId(cluster.getName(), 0)); - this.nodeStateChangeHandler = new StateChangeHandler(context, timer, eventLog); + this.nodeStateChangeHandler = new StateChangeHandler(context, timer, mock(EventLogInterface.class)); this.params.cluster(this.cluster); } @@ -150,13 +145,6 @@ public class ClusterFixture { return this; } - static Map<NodeType, Integer> buildTransitionTimeMap(int distributorTransitionTime, int storageTransitionTime) { - Map<NodeType, Integer> maxTransitionTime = new TreeMap<>(); - maxTransitionTime.put(NodeType.DISTRIBUTOR, distributorTransitionTime); - maxTransitionTime.put(NodeType.STORAGE, storageTransitionTime); - return maxTransitionTime; - } - void disableTransientMaintenanceModeOnDown() { this.params.transitionTimes(0); } diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGeneratorTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGeneratorTest.java index 78911c414a2..f786f86eaa6 100644 --- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGeneratorTest.java +++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStateGeneratorTest.java @@ -24,7 +24,7 @@ public class ClusterStateGeneratorTest { private static AnnotatedClusterState generateFromFixtureWithDefaultParams(ClusterFixture fixture) { final ClusterStateGenerator.Params params = new ClusterStateGenerator.Params(); params.cluster = fixture.cluster; - params.transitionTimes = ClusterFixture.buildTransitionTimeMap(0, 0); + params.transitionTimes = ClusterStateGenerator.Params.buildTransitionTimeMap(0, 0); params.currentTimeInMillis = 0; return ClusterStateGenerator.generatedStateFrom(params); } |