diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-09-03 08:16:35 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2019-09-03 08:16:35 +0200 |
commit | e1356fadd445fbf7d58d2c3f0574dea092964c08 (patch) | |
tree | 2ba233aad5996abc0600cf45223bab878da0cb26 /clustercontroller-core/src/main/java | |
parent | 7e26976e385c864da3b8bebaf63d4648bee694b2 (diff) |
Cleanup tests, no functional changes
Diffstat (limited to 'clustercontroller-core/src/main/java')
-rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java | 8 | ||||
-rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java | 4 | ||||
-rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java (renamed from clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java) | 5 |
3 files changed, 8 insertions, 9 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java index 43412311436..ddb9357f11f 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ContentCluster.java @@ -10,7 +10,7 @@ import com.yahoo.vdslib.distribution.ConfiguredNode; import com.yahoo.vdslib.state.*; import com.yahoo.vdslib.distribution.Distribution; import com.yahoo.vdslib.distribution.Group; -import com.yahoo.vespa.clustercontroller.core.status.statuspage.VdsClusterHtmlRendrer; +import com.yahoo.vespa.clustercontroller.core.status.statuspage.VdsClusterHtmlRenderer; import com.yahoo.vespa.clustercontroller.utils.staterestapi.requests.SetUnitStateRequest; import java.util.*; @@ -42,7 +42,7 @@ public class ContentCluster { } public void writeHtmlState( - final VdsClusterHtmlRendrer vdsClusterHtmlRendrer, + final VdsClusterHtmlRenderer vdsClusterHtmlRenderer, final StringBuilder sb, final Timer timer, final ClusterStateBundle state, @@ -51,8 +51,8 @@ public class ContentCluster { final FleetControllerOptions options, final EventLog eventLog) { - final VdsClusterHtmlRendrer.Table table = - vdsClusterHtmlRendrer.createNewClusterHtmlTable(clusterName, slobrokGenerationCount); + final VdsClusterHtmlRenderer.Table table = + vdsClusterHtmlRenderer.createNewClusterHtmlTable(clusterName, slobrokGenerationCount); final List<Group> groups = LeafGroups.enumerateFrom(distribution.getRootGroup()); diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java index 6d11c4f1239..f799492d164 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java @@ -6,7 +6,7 @@ import com.yahoo.vespa.clustercontroller.core.*; import com.yahoo.vespa.clustercontroller.core.Timer; import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageResponse; import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageServer; -import com.yahoo.vespa.clustercontroller.core.status.statuspage.VdsClusterHtmlRendrer; +import com.yahoo.vespa.clustercontroller.core.status.statuspage.VdsClusterHtmlRenderer; import java.util.*; @@ -62,7 +62,7 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa if (masterElectionHandler.isAmongNthFirst(data.getOptions().stateGatherCount)) { // Table overview of all the nodes cluster.writeHtmlState( - new VdsClusterHtmlRendrer(), + new VdsClusterHtmlRenderer(), content, timer, stateVersionTracker.getVersionedClusterStateBundle(), diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java index 0daa9ff7d37..6d21aa430a2 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRenderer.java @@ -15,11 +15,10 @@ import java.util.Map; import java.util.TimeZone; import java.util.TreeMap; - /** - * Renders webpage with status regarding cluster. + * Renders web page with cluster status. */ -public class VdsClusterHtmlRendrer { +public class VdsClusterHtmlRenderer { private static final TimeZone utcTimeZone = TimeZone.getTimeZone("UTC"); |