diff options
120 files changed, 268 insertions, 107 deletions
diff --git a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java index 1069bd79b4f..f43f04d1aac 100644 --- a/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java +++ b/clustercontroller-apputil/src/main/java/com/yahoo/vespa/clustercontroller/apputil/communication/http/JDiscHttpRequestHandler.java @@ -19,6 +19,7 @@ import java.util.logging.Logger; /** * Note. This class is tested through apache http instance test, using this as other endpoint. + * * @author Haakon Humberset * @author Harald Musum * @author Vegard Sjonfjell diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java index 28de4f836ba..f935b8b2cc7 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/AnnotatedClusterState.java @@ -10,6 +10,7 @@ import java.util.Objects; import java.util.Optional; public class AnnotatedClusterState { + private final ClusterState clusterState; private final Map<Node, NodeStateReason> nodeStateReasons; private final Optional<ClusterStateReason> clusterStateReason; @@ -66,4 +67,5 @@ public class AnnotatedClusterState { public int hashCode() { return Objects.hash(clusterState, nodeStateReasons, clusterStateReason); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterEvent.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterEvent.java index 1211ff52c74..64413062860 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterEvent.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterEvent.java @@ -41,4 +41,5 @@ public class ClusterEvent implements Event{ public String getCategory() { return type.toString(); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateReason.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateReason.java index 845d13650bd..3d594be5219 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateReason.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateReason.java @@ -8,8 +8,10 @@ package com.yahoo.vespa.clustercontroller.core; * they are obvious from direct inspection. */ public enum ClusterStateReason { + TOO_FEW_STORAGE_NODES_AVAILABLE, TOO_FEW_DISTRIBUTOR_NODES_AVAILABLE, TOO_LOW_AVAILABLE_STORAGE_NODE_RATIO, TOO_LOW_AVAILABLE_DISTRIBUTOR_NODE_RATIO, + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java index 5f7a86f6247..a0e93c2a9ad 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStateView.java @@ -23,7 +23,6 @@ import java.util.logging.Logger; * merges before steady-state is reached. * * @author hakonhall - * @since 5.33 */ public class ClusterStateView { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java index 265ca90100e..849a2aa23c2 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregator.java @@ -30,7 +30,6 @@ import com.yahoo.log.LogLevel; * from each distributor. * * @author hakonhall - * @since 5.34 */ public class ClusterStatsAggregator { @@ -121,4 +120,5 @@ public class ClusterStatsAggregator { } } } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Communicator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Communicator.java index 6f8995be01a..de0ba6bf33c 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Communicator.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Communicator.java @@ -21,4 +21,5 @@ public interface Communicator { void setSystemState(ClusterState state, NodeInfo node, Waiter<SetClusterStateRequest> waiter); void shutdown(); + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java index 34beb038e10..3f15a089349 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java @@ -139,4 +139,5 @@ public class EventLog implements EventLogInterface { } sb.append("</table>\n"); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java index 099d8ec0678..6381d25f023 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java @@ -7,12 +7,12 @@ import java.util.List; public interface EventLogInterface { - public void add(Event e); - public void add(Event e, boolean logInfo); - public void addNodeOnlyEvent(NodeEvent e, java.util.logging.Level level); - public int getNodeEventsSince(Node n, long time); - public long getRecentTimePeriod(); - public void writeHtmlState(StringBuilder sb, Node node); - public void setMaxSize(int size, int nodesize); + void add(Event e); + void add(Event e, boolean logInfo); + void addNodeOnlyEvent(NodeEvent e, java.util.logging.Level level); + int getNodeEventsSince(Node n, long time); + long getRecentTimePeriod(); + void writeHtmlState(StringBuilder sb, Node node); + void setMaxSize(int size, int nodesize); } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java index d8628663199..0b0653274a4 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java @@ -722,11 +722,10 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd } /* - System test observations: + System test observations: - a node that stops normally (U -> S) then goes down erroneously triggers premature crash handling - long time before content node state convergence (though this seems to be the case for legacy impl as well) */ - private boolean resyncLocallyCachedState() throws InterruptedException { boolean didWork = false; // Let non-master state gatherers update wanted states once in a while, so states generated and shown are close to valid. @@ -993,4 +992,5 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd public EventLog getEventLog() { return eventLog; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTask.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTask.java deleted file mode 100644 index 6c481c4f312..00000000000 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerTask.java +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.clustercontroller.core; - -/** - * Represents a task that the fleet controller should perform. - */ -public interface FleetControllerTask { - public void execute(FleetController fleetController); -} diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/GroupAvailabilityCalculator.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/GroupAvailabilityCalculator.java index eab242b78f2..686ef0dee6c 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/GroupAvailabilityCalculator.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/GroupAvailabilityCalculator.java @@ -17,12 +17,12 @@ import java.util.Set; import java.util.stream.Stream; class GroupAvailabilityCalculator { + private final Distribution distribution; private final double minNodeRatioPerGroup; private GroupAvailabilityCalculator(Distribution distribution, - double minNodeRatioPerGroup) - { + double minNodeRatioPerGroup) { this.distribution = distribution; this.minNodeRatioPerGroup = minNodeRatioPerGroup; } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java index f12f843d64c..581cc244a20 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/LatencyStats.java @@ -3,6 +3,7 @@ package com.yahoo.vespa.clustercontroller.core; /** * LatencyStats handles adding latencies and counts. + * * @author hakonhall */ public class LatencyStats { @@ -28,4 +29,5 @@ public class LatencyStats { public long getLatencyMsSum() { return latencyMsSum; } public long getCount() { return count; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeEvent.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeEvent.java index 08fcf9ec507..676f4228405 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeEvent.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeEvent.java @@ -49,4 +49,5 @@ public class NodeEvent implements Event { public Type getType() { return type; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeLookup.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeLookup.java index 94b426df6b1..ceb81e91b7d 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeLookup.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeLookup.java @@ -11,4 +11,5 @@ public interface NodeLookup { void shutdown(); boolean updateCluster(ContentCluster cluster, NodeAddedOrRemovedListener listener); + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java index 53079876bdc..97112e01aed 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeMergeStats.java @@ -5,7 +5,6 @@ import com.yahoo.vespa.clustercontroller.core.hostinfo.StorageNode; /** * @author hakonhall - * @since 5.33 */ public class NodeMergeStats { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java index 4172860d44c..2125a18f0fe 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateChangeChecker.java @@ -17,7 +17,7 @@ import java.util.Optional; /** * Checks if a node can be upgraded. * - * @author dybis + * @author Haakon Dybdahl */ public class NodeStateChangeChecker { public static final String BUCKETS_METRIC_NAME = "vds.datastored.alldisks.buckets"; diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateReason.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateReason.java index f51eddef5a5..a092e2012ec 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateReason.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/NodeStateReason.java @@ -2,9 +2,11 @@ package com.yahoo.vespa.clustercontroller.core; public enum NodeStateReason { + // FIXME some of these reasons may be unnecessary as they are reported implicitly by reported/wanted state changes NODE_TOO_UNSTABLE, WITHIN_MAINTENANCE_GRACE_PERIOD, FORCED_INTO_MAINTENANCE, GROUP_IS_DOWN + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RealTimer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RealTimer.java index 00de1f3ea2d..15f18b02865 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RealTimer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RealTimer.java @@ -58,4 +58,5 @@ public class RealTimer implements Timer { cal.get(Calendar.SECOND), cal.get(Calendar.MILLISECOND)); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RemoteClusterControllerTaskScheduler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RemoteClusterControllerTaskScheduler.java index a41af6c256e..6cd834e79ac 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RemoteClusterControllerTaskScheduler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/RemoteClusterControllerTaskScheduler.java @@ -2,5 +2,7 @@ package com.yahoo.vespa.clustercontroller.core; public interface RemoteClusterControllerTaskScheduler { - public void schedule(RemoteClusterControllerTask task); + + void schedule(RemoteClusterControllerTask task); + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java index ec55a6ca1af..6a44bee8cce 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageMergeStats.java @@ -10,7 +10,6 @@ import java.util.Set; * Class for storing the pending merge operation stats for all the storage nodes. * * @author hakonhall - * @since 5.34 */ public class StorageMergeStats implements Iterable<NodeMergeStats> { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java index 21bec495e43..d0afc1fa4b7 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStats.java @@ -11,7 +11,7 @@ public class StorageNodeStats { final private LatencyStats distributorPutLatency; /** - * @param distributorPutLatency The "put" latency from the point of view of the distributor. + * @param distributorPutLatency the "put" latency from the point of view of the distributor. */ public StorageNodeStats(LatencyStats distributorPutLatency) { this.distributorPutLatency = distributorPutLatency; } public LatencyStats getDistributorPutLatency() { return distributorPutLatency; } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java index e23475ca57e..1fb24e72218 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/StorageNodeStatsContainer.java @@ -24,4 +24,5 @@ public class StorageNodeStatsContainer { } public int size() { return storageNodesByIndex.size(); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Timer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Timer.java index fb659e599ba..b50096ba63e 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Timer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/Timer.java @@ -6,5 +6,7 @@ package com.yahoo.vespa.clustercontroller.core; * tests without relying on the speed of the unit test processing. */ public interface Timer { - public long getCurrentTimeInMillis(); + + long getCurrentTimeInMillis(); + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java index 5c1c5980ebc..ebedb920b72 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Distributor.java @@ -7,13 +7,15 @@ import java.util.ArrayList; import java.util.List; /** - * Class for handling Distributor part of HostInfo. - * @author dybis - */ + * Class for handling Distributor part of HostInfo. + * + * @author Haakon Dybdahl + */ public class Distributor { @JsonProperty("storage-nodes") private List<StorageNode> storageNodes = new ArrayList<>(); public List<StorageNode> getStorageNodes() { return storageNodes; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java index 77e9f5b890d..a6a3afcf6b2 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java @@ -11,7 +11,8 @@ import java.util.logging.Logger; /** * Parsing and keeping of host info from nodes. - * @author dybis + * + * @author Haakon Dybdahl */ public class HostInfo { @@ -67,4 +68,5 @@ public class HostInfo { } public HostInfo() {} + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java index fbf5f848157..cb2a1e92612 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Metrics.java @@ -10,7 +10,8 @@ import java.util.Optional; /** * Keeper for Metrics for HostInfo. - * @author dybis + * + * @author Haakon Dybdahl */ public class Metrics { @@ -67,4 +68,5 @@ public class Metrics { // We initialize it in case the metrics is missing in the JSON. @JsonProperty("values") private ArrayList<Metric> metricsList = new ArrayList<>(); + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java index 47c28d20c90..9e951236c45 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNode.java @@ -6,7 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * Keeping information about a storage node seen from the distributor. - * @author dybis + * + * @author Haakon Dybdahl */ public class StorageNode { @@ -97,4 +98,5 @@ public class StorageNode { public OutstandingMergeOps getOutstandingMergeOpsOrNull() { return outstandingMergeOps; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java index 02516ce79ac..6d0da8a9fba 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/StorageNodeStatsBridge.java @@ -13,6 +13,7 @@ import java.util.Map; /** * Class used to create a StorageNodeStatsContainer from HostInfo. + * * @author hakonhall */ public class StorageNodeStatsBridge { @@ -51,4 +52,5 @@ public class StorageNodeStatsBridge { } return new StorageMergeStats(mapToNodeStats); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java index fc75bfe898b..39c4366c2c3 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/Vtag.java @@ -6,7 +6,8 @@ import com.fasterxml.jackson.annotation.JsonProperty; /** * Class for handling version. - * @author dybis + * + * @author Haakon Dybdahl */ public class Vtag { @@ -20,4 +21,5 @@ public class Vtag { public String getVersionOrNull() { return version; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/listeners/SystemStateListener.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/listeners/SystemStateListener.java index 747c33d0e07..617f91cb837 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/listeners/SystemStateListener.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/listeners/SystemStateListener.java @@ -4,5 +4,7 @@ package com.yahoo.vespa.clustercontroller.core.listeners; import com.yahoo.vdslib.state.ClusterState; public interface SystemStateListener { - public void handleNewSystemState(ClusterState state); + + void handleNewSystemState(ClusterState state); + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Id.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Id.java index 5305ec177ba..ed5af93d7fb 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Id.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Id.java @@ -11,6 +11,7 @@ package com.yahoo.vespa.clustercontroller.core.restapiv2; import com.yahoo.vdslib.state.NodeType; public class Id { + public static class Cluster extends Id { private final String id; @@ -62,4 +63,5 @@ public class Id { public final int getPartitionIndex() { return id; } public String toString() { return super.toString() + "/" + id; } } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/MissingIdException.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/MissingIdException.java index 41503c9de06..9ee6e960c46 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/MissingIdException.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/MissingIdException.java @@ -5,6 +5,7 @@ import com.yahoo.vdslib.state.Node; import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.MissingUnitException; public class MissingIdException extends MissingUnitException { + private static String[] createPath(String cluster, Node n) { String[] path = new String[3]; path[0] = cluster; @@ -16,4 +17,5 @@ public class MissingIdException extends MissingUnitException { public MissingIdException(String cluster, Node n) { super(createPath(cluster, n), 1); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/OtherMasterIndexException.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/OtherMasterIndexException.java index 8f5bd638c51..331165b4191 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/OtherMasterIndexException.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/OtherMasterIndexException.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.core.restapiv2; public class OtherMasterIndexException extends Exception { + private final int index; public OtherMasterIndexException(int index) { @@ -9,4 +10,5 @@ public class OtherMasterIndexException extends Exception { } public int getMasterIndex() { return index; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Request.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Request.java index cb260e7de2a..924614df327 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Request.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Request.java @@ -7,6 +7,7 @@ import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.StateRestApiE import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.UnknownMasterException; public abstract class Request<Result> extends RemoteClusterControllerTask { + public enum MasterState { MUST_BE_MASTER, NEED_NOT_BE_MASTER @@ -65,4 +66,5 @@ public abstract class Request<Result> extends RemoteClusterControllerTask { } public abstract Result calculateResult(Context context) throws StateRestApiException, OtherMasterIndexException; + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java index 032d5775329..26c66fea165 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java @@ -12,6 +12,7 @@ import java.util.LinkedHashMap; import java.util.Map; public class Response { + public static class UnitStateImpl implements UnitState { private final String id; private final String reason; @@ -126,4 +127,5 @@ public class Response { public static class ServiceResponse extends EmptyResponse<NodeResponse> {} public static class NodeResponse extends EmptyResponse<PartitionResponse> {} public static class PartitionResponse extends EmptyResponse<UnitResponse> {} + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/UnitPathResolver.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/UnitPathResolver.java index f812ac5d287..4dc73f4d0dd 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/UnitPathResolver.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/UnitPathResolver.java @@ -12,14 +12,19 @@ import java.util.HashMap; import java.util.Map; public class UnitPathResolver<T> { + public interface Visitor<T> { - public Request<? extends T> visitGlobal() throws StateRestApiException; - public Request<? extends T> visitCluster(Id.Cluster id) throws StateRestApiException; - public Request<? extends T> visitService(Id.Service id) throws StateRestApiException; - public Request<? extends T> visitNode(Id.Node id) throws StateRestApiException; - public Request<? extends T> visitPartition(Id.Partition id) throws StateRestApiException; + + Request<? extends T> visitGlobal() throws StateRestApiException; + Request<? extends T> visitCluster(Id.Cluster id) throws StateRestApiException; + Request<? extends T> visitService(Id.Service id) throws StateRestApiException; + Request<? extends T> visitNode(Id.Node id) throws StateRestApiException; + Request<? extends T> visitPartition(Id.Partition id) throws StateRestApiException; + } + public static abstract class AbstractVisitor<T> implements Visitor<T> { + private final String path[]; private final String failureMessage; @@ -36,6 +41,7 @@ public class UnitPathResolver<T> { public Request<? extends T> visitService(Id.Service id) throws StateRestApiException { return fail(); } public Request<? extends T> visitNode(Id.Node id) throws StateRestApiException { return fail(); } public Request<? extends T> visitPartition(Id.Partition id) throws StateRestApiException { return fail(); } + } private final Map<String, RemoteClusterControllerTaskScheduler> fleetControllers; @@ -92,4 +98,5 @@ public class UnitPathResolver<T> { } throw new MissingUnitException(path, 4); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateRequest.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateRequest.java index 80fc56d625c..e298aa64db4 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateRequest.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateRequest.java @@ -18,4 +18,5 @@ public class RPCGetNodeStateRequest extends GetNodeStateRequest { public void abort() { request.abort(); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateWaiter.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateWaiter.java index 858abca325d..06046e7550d 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateWaiter.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCGetNodeStateWaiter.java @@ -59,4 +59,5 @@ public class RPCGetNodeStateWaiter implements RequestWaiter { request.setReply(convertToReply(req)); waiter.done(request); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCSetClusterStateWaiter.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCSetClusterStateWaiter.java index 09e1afa9a3f..39506ddf7fa 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCSetClusterStateWaiter.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RPCSetClusterStateWaiter.java @@ -54,4 +54,5 @@ public class RPCSetClusterStateWaiter implements RequestWaiter { this.request.setReply(reply); waiter.done(this.request); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java index 444c10b84e3..7f525c438bf 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/rpc/RpcServer.java @@ -319,4 +319,5 @@ public class RpcServer { } return handledAnyRequests; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/ClusterStateRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/ClusterStateRequestHandler.java index 32032aa48f6..a866c870377 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/ClusterStateRequestHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/ClusterStateRequestHandler.java @@ -7,6 +7,7 @@ import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageRespon import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageServer; public class ClusterStateRequestHandler implements StatusPageServer.RequestHandler { + private final StateVersionTracker stateVersionTracker; public ClusterStateRequestHandler(StateVersionTracker stateVersionTracker) { @@ -21,4 +22,5 @@ public class ClusterStateRequestHandler implements StatusPageServer.RequestHandl response.writeContent(cs.toString()); return response; } + } 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 901f55f6793..2ced8648ced 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 @@ -10,7 +10,7 @@ import java.util.Iterator; import java.util.TimeZone; /** -* @author <a href="mailto:humbe@yahoo-inc.com">Haakon Humberset</a> +* @author Haakon Humberset */ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHandler { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java index 732bc49f5fe..256730f066a 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyNodePageRequestHandler.java @@ -12,7 +12,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** -* @author <a href="mailto:humbe@yahoo-inc.com">Haakon Humberset</a> +* @author Haakon Humberset */ public class LegacyNodePageRequestHandler implements StatusPageServer.RequestHandler { diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java index 0cca2bd4b6b..a5047b7c106 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/NodeHealthRequestHandler.java @@ -5,9 +5,10 @@ import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageRespon import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageServer; /** -* @author <a href="mailto:humbe@yahoo-inc.com">Haakon Humberset</a> +* @author Haakon Humberset */ public class NodeHealthRequestHandler implements StatusPageServer.RequestHandler { + private final RunDataExtractor data; public NodeHealthRequestHandler(RunDataExtractor data) { @@ -34,4 +35,5 @@ public class NodeHealthRequestHandler implements StatusPageServer.RequestHandler response.writeContent(content.toString()); return response; } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java index 128ba10484a..d7df3565062 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/RunDataExtractor.java @@ -6,13 +6,13 @@ import com.yahoo.vespa.clustercontroller.core.FleetControllerOptions; import com.yahoo.vespa.clustercontroller.core.ContentCluster; /** - * @author <a href="mailto:humbe@yahoo-inc.com">Haakon Humberset</a> + * @author Haakon Humberset */ public interface RunDataExtractor { - public ClusterState getLatestClusterState(); - public FleetControllerOptions getOptions(); - public long getConfigGeneration(); - public ContentCluster getCluster(); + ClusterState getLatestClusterState(); + FleetControllerOptions getOptions(); + long getConfigGeneration(); + ContentCluster getCluster(); } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java index 6c5a069a4b9..ac9634478fa 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java @@ -16,12 +16,18 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; public class StatusHandler implements HttpRequestHandler { + private final static Logger log = Logger.getLogger(StatusHandler.class.getName()); - public static interface ClusterStatusPageServerSet { - public ContainerStatusPageServer get(String cluster); - public Map<String, ContainerStatusPageServer> getAll(); + + public interface ClusterStatusPageServerSet { + + ContainerStatusPageServer get(String cluster); + Map<String, ContainerStatusPageServer> getAll(); + } + public static class ContainerStatusPageServer implements StatusPageServerInterface { + StatusPageServer.HttpRequest request; StatusPageResponse response; // Ensure only only one use the server at a time @@ -64,7 +70,9 @@ public class StatusHandler implements HttpRequestHandler { } } } + } + private static Pattern clusterListRequest = Pattern.compile("^/clustercontroller-status/v1/?$"); private static Pattern statusRequest = Pattern.compile("^/clustercontroller-status/v1/([^/]+)(/.*)?$"); private final ClusterStatusPageServerSet statusClusters; diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageResponse.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageResponse.java index 53f25056a4c..84850eb344c 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageResponse.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageResponse.java @@ -81,4 +81,5 @@ public class StatusPageResponse { content.append("</body>\n") .append("</html>\n"); } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java index 9e566b47668..ed4192941b4 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServer.java @@ -400,4 +400,5 @@ public class StatusPageServer implements Runnable, StatusPageServerInterface { currentHttpRequest = null; // Avoid fleetcontroller processing request more than once } } + } diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServerInterface.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServerInterface.java index e8072be7366..c9cc13e1803 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServerInterface.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/StatusPageServerInterface.java @@ -2,9 +2,11 @@ package com.yahoo.vespa.clustercontroller.core.status.statuspage; public interface StatusPageServerInterface { - public int getPort(); - public void shutdown() throws InterruptedException, java.io.IOException; - public void setPort(int port) throws java.io.IOException, InterruptedException; - public StatusPageServer.HttpRequest getCurrentHttpRequest(); - public void answerCurrentStatusRequest(StatusPageResponse r); + + int getPort(); + void shutdown() throws InterruptedException, java.io.IOException; + void setPort(int port) throws java.io.IOException, InterruptedException; + StatusPageServer.HttpRequest getCurrentHttpRequest(); + void answerCurrentStatusRequest(StatusPageResponse r); + } 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/VdsClusterHtmlRendrer.java index a79f053619d..2ed98855121 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/VdsClusterHtmlRendrer.java @@ -22,6 +22,7 @@ import java.util.TreeMap; * Renders webpage with status regarding cluster. */ public class VdsClusterHtmlRendrer { + private static final TimeZone utcTimeZone = TimeZone.getTimeZone("UTC"); public static class Table { @@ -301,4 +302,5 @@ public class VdsClusterHtmlRendrer { public Table createNewClusterHtmlTable(final String clusterName, final int slobrokGenerationCount) { return new Table(clusterName, slobrokGenerationCount); } + } diff --git a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java index 64faeeefb0b..94695cd712e 100644 --- a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java +++ b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/ClusterControllerConfigFetcher.java @@ -16,6 +16,7 @@ import com.yahoo.cloud.config.ZookeepersConfig; import java.util.logging.Logger; public class ClusterControllerConfigFetcher { + private static Logger log = Logger.getLogger(ClusterControllerConfigFetcher.class.getName()); private final ConfigSubscriber configSubscriber = new ConfigSubscriber(); @@ -93,4 +94,5 @@ public class ClusterControllerConfigFetcher { boolean configUpdated(long timeoutMillis) { return configSubscriber.nextConfig(timeoutMillis); } + } diff --git a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java index a32039a07d2..2d6880e0551 100644 --- a/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java +++ b/clustercontroller-standalone/src/main/java/com/yahoo/vespa/clustercontroller/standalone/StandAloneClusterController.java @@ -12,6 +12,7 @@ import java.util.logging.Logger; * This is the class containing the main method used to run fleet controller as a stand-alone program. */ public class StandAloneClusterController { + private static Logger log = Logger.getLogger(StandAloneClusterController.class.getName()); private final ClusterControllerConfigFetcher config; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java index 92697e0e277..773aff08c08 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncCallback.java @@ -2,6 +2,8 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public interface AsyncCallback<T> { + /** Callback indicating the given operation has completed. */ - public void done(AsyncOperation<T> op); + void done(AsyncOperation<T> op); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java index ef3a2a43e6d..7d6b37a4f93 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperation.java @@ -2,11 +2,12 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public interface AsyncOperation<T> { + /** * Attempt to cancel the given operation. * @return True if successfully cancelled. False if cancel is not supported, or operation already succeeded. */ - public boolean cancel(); + boolean cancel(); /** * Register a callback to be called when this operation completes. If operation is already completed, this callback @@ -24,35 +25,37 @@ public interface AsyncOperation<T> { /** * Get the name of the operation. Useful to identify what operation this is. */ - public String getName(); + String getName(); /** * Get a description of the operation. May be empty. If operation is complex one might want to use a short name for * simplicity, but have the whole request available if needed. In the HTTP case an application may for instance include * the URL in the name, and add the request headers to the description. */ - public String getDescription(); + String getDescription(); /** * Get the progress as a number between 0 and 1 where 0 means not started and 1 means operation is complete. * A return value of null indicates that the operation is unable to track progress. */ - public Double getProgress(); + Double getProgress(); /** * Get the result of the operation. * Note that some operations may not have a result if the operation failed. */ - public T getResult(); + T getResult(); /** Get the cause of an operation failing. Returns null on successful operations. */ - public Exception getCause(); + Exception getCause(); /** Returns true if operation has been successfully cancelled. */ - public boolean isCanceled(); + boolean isCanceled(); + /** Returns true if operation has completed. Regardless of whether it was a success or a failure. */ - public boolean isDone(); + boolean isDone(); + /** Returns true if the operation was a success. */ - public boolean isSuccess(); + boolean isSuccess(); } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java index b19e970d66b..dde370b637b 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationImpl.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; import java.util.logging.Logger; public class AsyncOperationImpl<T> implements AsyncOperation<T> { + private static final Logger log = Logger.getLogger(AsyncOperationImpl.class.getName()); private final String name; private final String description; @@ -80,4 +81,5 @@ public class AsyncOperationImpl<T> implements AsyncOperation<T> { public void unregister(AsyncCallback<T> callback) { listenImpl.unregister(callback); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java index 119163e2fa4..6d8a24f58e9 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncOperationListenImpl.java @@ -8,6 +8,7 @@ import java.util.HashSet; import java.util.logging.Logger; public class AsyncOperationListenImpl<T> { + private static final Logger log = Logger.getLogger(AsyncOperationListenImpl.class.getName()); private final Collection<AsyncCallback<T>> listeners = new HashSet<>(); private boolean listenersNotified = false; @@ -44,4 +45,5 @@ public class AsyncOperationListenImpl<T> { listenersNotified = true; } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java index 64ca05fe945..881218b9e52 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/AsyncUtils.java @@ -8,4 +8,5 @@ public class AsyncUtils { try{ Thread.sleep(1); } catch (InterruptedException e) {} } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/PipedAsyncOperation.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/PipedAsyncOperation.java index 71b32713f20..522a2c368bd 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/PipedAsyncOperation.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/PipedAsyncOperation.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public abstract class PipedAsyncOperation<S, T> extends RedirectedAsyncOperation<S, T> { + private T result; public PipedAsyncOperation(AsyncOperation<S> source) { @@ -20,4 +21,5 @@ public abstract class PipedAsyncOperation<S, T> extends RedirectedAsyncOperation public T getResult() { return result; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java index 045232ac07c..957c8f8168c 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/RedirectedAsyncOperation.java @@ -5,6 +5,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; * Utility class in order to wrap com.yahoo.vespa.clustercontroller.utils.communication.async operation callbacks. Useful when translating com.yahoo.vespa.clustercontroller.utils.communication.async operations returning JSON to com.yahoo.vespa.clustercontroller.utils.communication.async operations returning specific values. */ public abstract class RedirectedAsyncOperation<S, T> implements AsyncOperation<T> { + protected final AsyncOperation<S> source; private final AsyncOperationListenImpl<T> listenImpl; private AsyncCallback<S> beforeCallbackTask; @@ -60,4 +61,5 @@ public abstract class RedirectedAsyncOperation<S, T> implements AsyncOperation<T public void unregister(AsyncCallback<T> callback) { listenImpl.unregister(callback); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java index 1aad7fb9b84..85c6b9070e6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/async/SuccessfulAsyncCallback.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.async; public abstract class SuccessfulAsyncCallback<Source, Target> implements AsyncCallback<Source> { + private final AsyncOperationImpl<Target> target; public SuccessfulAsyncCallback(final AsyncOperationImpl<Target> target) { diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java index 0cf872f0db8..6af3e4de759 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClient.java @@ -4,13 +4,13 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperation; /** - * Abstraction of an asynchronious HTTP client, such that applications don't need to depend directly on an HTTP client. + * Abstraction of an asynchronous HTTP client, such that applications don't need to depend directly on an HTTP client. */ public interface AsyncHttpClient<V extends HttpResult> { - public AsyncOperation<V> execute(HttpRequest r); + AsyncOperation<V> execute(HttpRequest r); /** Attempt to cancel all pending operations and shut down the client. */ - public void close(); + void close(); } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java index d9118be3335..d824303df57 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/AsyncHttpClientWithBase.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperation; public class AsyncHttpClientWithBase<V extends HttpResult> implements AsyncHttpClient<V> { + protected final AsyncHttpClient<V> client; private HttpRequest baseRequest = new HttpRequest(); @@ -34,4 +35,5 @@ public class AsyncHttpClientWithBase<V extends HttpResult> implements AsyncHttpC public void close() { client.close(); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java index f92c856b6c6..b4de05b0588 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequest.java @@ -7,6 +7,7 @@ import java.util.LinkedList; import java.util.List; public class HttpRequest extends CertainlyCloneable<HttpRequest> { + public static class KeyValuePair { public String key; public String value; @@ -21,6 +22,7 @@ public class HttpRequest extends CertainlyCloneable<HttpRequest> { return key; } } + public enum HttpOp { GET, POST, PUT, DELETE } private String host; @@ -145,4 +147,5 @@ public class HttpRequest extends CertainlyCloneable<HttpRequest> { } return false; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java index 82c0e6b259d..b3e31c751c6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpRequestHandler.java @@ -3,5 +3,6 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; public interface HttpRequestHandler { - public HttpResult handleRequest(HttpRequest request) throws Exception; + HttpResult handleRequest(HttpRequest request) throws Exception; + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java index 9f84295d299..e82c44250e6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/HttpResult.java @@ -6,6 +6,7 @@ import java.util.LinkedList; import java.util.List; public class HttpResult { + private static class HttpReturnCode { private final int code; private final String message; @@ -84,4 +85,5 @@ public class HttpResult { public void printContent(StringBuilder sb) { sb.append(content.toString()); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java index 1aa1c002fbd..dac4decc1ee 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonAsyncHttpClient.java @@ -10,6 +10,7 @@ import org.codehaus.jettison.json.JSONObject; * Wrapped for the HTTP client, converting requests to/from JSON. */ public class JsonAsyncHttpClient implements AsyncHttpClient<JsonHttpResult> { + private AsyncHttpClient<HttpResult> client; private boolean verifyRequestContentAsJson = true; private boolean addJsonContentType = true; @@ -54,4 +55,5 @@ public class JsonAsyncHttpClient implements AsyncHttpClient<JsonHttpResult> { public void close() { client.close(); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java index ab63259c5cd..4ed61864638 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java @@ -6,6 +6,7 @@ import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; public class JsonHttpResult extends HttpResult { + private JSONObject json; private boolean failedParsing = false; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java index b74fbca0f03..2d967223f9e 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/LoggingAsyncHttpClient.java @@ -10,6 +10,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public class LoggingAsyncHttpClient<T extends HttpResult> extends AsyncHttpClientWithBase<T> { + private static final Logger log = Logger.getLogger(LoggingAsyncHttpClient.class.getName()); private int requestCounter = 0; @@ -38,4 +39,5 @@ public class LoggingAsyncHttpClient<T extends HttpResult> extends AsyncHttpClien } }; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java index 536446724e3..3d6658ae366 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/ProxyAsyncHttpClient.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; import com.yahoo.vespa.clustercontroller.utils.communication.async.AsyncOperation; public class ProxyAsyncHttpClient<V extends HttpResult> extends AsyncHttpClientWithBase<V> { + private final String proxyHost; private final int proxyPort; @@ -25,4 +26,5 @@ public class ProxyAsyncHttpClient<V extends HttpResult> extends AsyncHttpClientW path.append(r.getPath()); return client.execute(r.setHost(proxyHost).setPort(proxyPort).setPath(path.toString())); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java index 20192e63671..2a3af5724ab 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/RequestQueue.java @@ -11,6 +11,7 @@ import java.util.logging.Logger; * Utility class to schedule HTTP requests and keeping a maximum amount of them pending at a time. */ public class RequestQueue<V extends HttpResult> { + private static final Logger log = Logger.getLogger(RequestQueue.class.getName()); private final AsyncHttpClient<V> httpClient; private final LinkedList<Request<V>> requestQueue = new LinkedList<>(); @@ -82,4 +83,5 @@ public class RequestQueue<V extends HttpResult> { } } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java index 99a67cfd60a..b8890550dc6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/SyncHttpClient.java @@ -2,8 +2,10 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http; public interface SyncHttpClient { - public HttpResult execute(HttpRequest r); + + HttpResult execute(HttpRequest r); /** Attempt to cancel all pending operations and shut down the client. */ - public void close(); + void close(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java index 148a514d624..eae7e15541b 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/TimeoutHandler.java @@ -12,6 +12,7 @@ import java.util.concurrent.TimeoutException; import java.util.logging.Logger; public class TimeoutHandler<V extends HttpResult> extends AsyncHttpClientWithBase<V> { + public static class InternalRequest<V extends HttpResult> extends AsyncOperationImpl<V> { final AsyncOperation<V> operation; long startTime; @@ -146,4 +147,5 @@ public class TimeoutHandler<V extends HttpResult> extends AsyncHttpClientWithBas requests.values().remove(r); } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java index 7ec55a3e7a4..d60afe599c3 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/writer/HttpWriter.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.communication.http.writer; public class HttpWriter { + private final StringBuilder builder = new StringBuilder(); private String title = "Untitled page"; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java index 503d3e8835b..1b148755aec 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InternalFailure.java @@ -6,4 +6,5 @@ public class InternalFailure extends StateRestApiException { public InternalFailure(String description) { super("Internal failure. Should not happen: " + description); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java index ceba126ac58..c9f69226fa6 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidContentException.java @@ -8,4 +8,5 @@ public class InvalidContentException extends StateRestApiException { setHtmlCode(400); setHtmlStatus("Content of HTTP request had invalid data"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java index 1fe5e70f651..f82c6866e82 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/InvalidOptionValueException.java @@ -8,4 +8,5 @@ public class InvalidOptionValueException extends StateRestApiException { setHtmlCode(400); setHtmlStatus("Option '" + option + "' have invalid value '" + value + "'"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java index 03a14bf9591..8176c0f1485 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingResourceException.java @@ -5,7 +5,9 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.errors; * @author hakonhall */ public class MissingResourceException extends StateRestApiException { + public MissingResourceException(String resource) { super("Missing resource '" + resource + "'"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java index c84fbd3a631..c45ce2527cb 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/MissingUnitException.java @@ -18,4 +18,5 @@ public class MissingUnitException extends StateRestApiException { setHtmlCode(404); setHtmlStatus(getMessage()); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java index c361b6f59aa..94b5e62355b 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/NotMasterException.java @@ -6,4 +6,5 @@ public abstract class NotMasterException extends StateRestApiException { public NotMasterException(String description) { super(description); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java index 0f8522d64eb..838bc4443b4 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OperationNotSupportedForUnitException.java @@ -16,4 +16,5 @@ public class OperationNotSupportedForUnitException extends StateRestApiException setHtmlCode(405); setHtmlStatus("Operation not supported for resource"); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java index 3c6ea166bd6..df663521418 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/OtherMasterException.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.errors; public class OtherMasterException extends NotMasterException { + private final String masterHost; private final int masterPort; @@ -13,4 +14,5 @@ public class OtherMasterException extends NotMasterException { public String getHost() { return masterHost; } public int getPort() { return masterPort; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java index 9c67d36eee3..b41354c77da 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/StateRestApiException.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.errors; public abstract class StateRestApiException extends Exception { + private Integer htmlCode; private String htmlStatus; @@ -29,4 +30,5 @@ public abstract class StateRestApiException extends Exception { public Integer getCode() { return htmlCode; } public String getStatus() { return htmlStatus; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java index eade2e807c9..ede631626a5 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/errors/UnknownMasterException.java @@ -10,4 +10,5 @@ public class UnknownMasterException extends NotMasterException { public UnknownMasterException() { super("No known master cluster controller currently exists."); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java index 78552f62e06..d583e4ecc27 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/SetUnitStateRequest.java @@ -61,4 +61,5 @@ public interface SetUnitStateRequest extends UnitRequest { } } ResponseWait getResponseWait(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java index 2d211d87310..9b46d619651 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitRequest.java @@ -2,5 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.requests; public interface UnitRequest { + String[] getUnitPath(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java index 4275a09c423..9f8842ee77c 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/requests/UnitStateRequest.java @@ -2,6 +2,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.requests; public interface UnitStateRequest extends UnitRequest { - public int getRecursiveLevels(); + + int getRecursiveLevels(); } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java index ed7d0c966df..e7af27fdf06 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/CurrentUnitState.java @@ -4,5 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface CurrentUnitState { - public Map<String, UnitState> getStatePerType(); + + Map<String, UnitState> getStatePerType(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java index bda56c4b5a0..0f037397286 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SetResponse.java @@ -3,9 +3,11 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; /** * The response of a set operation. - * @author dybis + * + * @author Haakon Dybdahl */ public class SetResponse { + private final String reason; private final boolean wasModified; @@ -16,13 +18,16 @@ public class SetResponse { /** * Indicates if data was modified in a set operation. + * * @return true if modified. */ public boolean getWasModified() { return wasModified; } /** * Human readable reason. + * * @return reason as string */ public String getReason() { return reason; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java index 0fbbe5837a1..6a47d5079c3 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/SubUnitList.java @@ -4,7 +4,9 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface SubUnitList { + /** id to link map. */ - public Map<String, String> getSubUnitLinks(); - public Map<String, UnitResponse> getSubUnits(); + Map<String, String> getSubUnitLinks(); + Map<String, UnitResponse> getSubUnits(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java index 9d1e780e2a5..0cb19492747 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitAttributes.java @@ -4,5 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface UnitAttributes { - public Map<String, String> getAttributeValues(); + + Map<String, String> getAttributeValues(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java index 770382951f5..8a2e126cdc0 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitMetrics.java @@ -4,5 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface UnitMetrics { - public Map<String, Number> getMetricMap(); + + Map<String, Number> getMetricMap(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java index 43ce05f22b3..583820f5535 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitResponse.java @@ -4,8 +4,10 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; import java.util.Map; public interface UnitResponse { - public UnitAttributes getAttributes(); - public CurrentUnitState getCurrentState(); - public Map<String, SubUnitList> getSubUnits(); - public UnitMetrics getMetrics(); + + UnitAttributes getAttributes(); + CurrentUnitState getCurrentState(); + Map<String, SubUnitList> getSubUnits(); + UnitMetrics getMetrics(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java index 376bb0893a7..fa713acbdcc 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/response/UnitState.java @@ -2,6 +2,8 @@ package com.yahoo.vespa.clustercontroller.utils.staterestapi.response; public interface UnitState { - public String getId(); - public String getReason(); + + String getId(); + String getReason(); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java index 04dcb582389..3d0856669f1 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java @@ -12,6 +12,7 @@ import java.util.HashMap; import java.util.Map; public class JsonReader { + private static class UnitStateImpl implements UnitState { private final String id; private final String reason; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java index 8a08619d3c1..11b0dc33610 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java @@ -8,6 +8,7 @@ import org.codehaus.jettison.json.JSONObject; import java.util.Map; public class JsonWriter { + private String pathPrefix = "/"; public JsonWriter() { @@ -100,4 +101,5 @@ public class JsonWriter { jsonObject.put("reason", setResponse.getReason()); return jsonObject; } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java index fcdf3214c45..395958063f5 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/RestApiHandler.java @@ -18,6 +18,7 @@ import java.util.logging.Level; import java.util.logging.Logger; public class RestApiHandler implements HttpRequestHandler { + private final static Logger log = Logger.getLogger(RestApiHandler.class.getName()); private final StateRestAPI restApi; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java index 1639899cbdf..80f06b62675 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/FakeClock.java @@ -7,6 +7,7 @@ import java.util.logging.Logger; * Unit tests want to fast forward time to avoid waiting for time to pass */ public class FakeClock extends SettableClock { + private static final Logger logger = Logger.getLogger(FakeClock.class.getName()); protected long currentTime = 1; @@ -33,4 +34,5 @@ public class FakeClock extends SettableClock { currentTime = newTime; } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java index 51adc60a50b..12b398709f0 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/SettableClock.java @@ -4,6 +4,8 @@ package com.yahoo.vespa.clustercontroller.utils.test; import com.yahoo.vespa.clustercontroller.utils.util.Clock; public abstract class SettableClock extends Clock { + public abstract void set(long newTime); public abstract void adjust(long adjustment); + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java index 861ee69e9aa..87ecd127e44 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/test/TestTransport.java @@ -23,6 +23,7 @@ import java.util.logging.Logger; * going through HTTP if you are using the HTTP abstraction layer in communication.http package. */ public class TestTransport { + private static final Logger log = Logger.getLogger(TestTransport.class.getName()); private static class Handler { HttpRequestHandler handler; diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java index f19e9c6f57b..f133f2f231c 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/CertainlyCloneable.java @@ -6,6 +6,7 @@ package com.yahoo.vespa.clustercontroller.utils.util; * coverage, this class exist to hide the clone not supported exceptions that should never happen. */ public class CertainlyCloneable<T> implements Cloneable { + @Override public Object clone() { try{ @@ -19,4 +20,5 @@ public class CertainlyCloneable<T> implements Cloneable { protected Object callParentClone() throws CloneNotSupportedException { return super.clone(); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java index 06d9bef2cc6..b21ee3667d7 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/Clock.java @@ -5,7 +5,9 @@ package com.yahoo.vespa.clustercontroller.utils.util; * Wrap access to clock so that we can override it in unit tests */ public class Clock { + public long getTimeInMillis() { return System.currentTimeMillis(); } public int getTimeInSecs() { return (int)(getTimeInMillis() / 1000); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java index b55592cadc3..7985f6966d1 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/ComponentMetricReporter.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.TreeMap; public class ComponentMetricReporter implements MetricReporter { + private final MetricReporter impl; private final String prefix; private final Map<String, String> defaultDimensions = new TreeMap<>(); @@ -52,4 +53,5 @@ public class ComponentMetricReporter implements MetricReporter { } return impl.createContext(m); } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java index 78d215e89b4..22b2797997a 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/JSONObjectWrapper.java @@ -23,4 +23,5 @@ public class JSONObjectWrapper extends JSONObject { throw new NullPointerException(e.getMessage()); } } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java index f9422081f05..a1bd0b61093 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/MetricReporter.java @@ -7,11 +7,14 @@ package com.yahoo.vespa.clustercontroller.utils.util; * reports on to injected jdisc implementation. */ public interface MetricReporter { + void set(java.lang.String s, java.lang.Number number, Context context); void add(java.lang.String s, java.lang.Number number, Context context); Context createContext(java.util.Map<java.lang.String,?> dimensions); - static interface Context { + + interface Context { } + } diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java index a99ac04fbf7..3d0989beb90 100644 --- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java +++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/util/NoMetricReporter.java @@ -4,6 +4,7 @@ package com.yahoo.vespa.clustercontroller.utils.util; import java.util.Map; public class NoMetricReporter implements MetricReporter { + @Override public void set(String s, Number number, Context context) {} @@ -12,4 +13,5 @@ public class NoMetricReporter implements MetricReporter { @Override public Context createContext(Map<String, ?> stringMap) { return null; } + } diff --git a/component/src/main/java/com/yahoo/component/AbstractComponent.java b/component/src/main/java/com/yahoo/component/AbstractComponent.java index 455e1a437a6..41d4c0dc6e9 100644 --- a/component/src/main/java/com/yahoo/component/AbstractComponent.java +++ b/component/src/main/java/com/yahoo/component/AbstractComponent.java @@ -141,4 +141,5 @@ public class AbstractComponent implements Component { Class declaringClass = deconstruct.getDeclaringClass(); return (declaringClass != AbstractComponent.class); } + } diff --git a/component/src/main/java/com/yahoo/component/Component.java b/component/src/main/java/com/yahoo/component/Component.java index 3fd98e72599..9740ef9d490 100644 --- a/component/src/main/java/com/yahoo/component/Component.java +++ b/component/src/main/java/com/yahoo/component/Component.java @@ -4,7 +4,6 @@ package com.yahoo.component; /** * A named, versioned, identifiable component. - * <p> * Components can by default be ordered by their id order. Their identity is defined by the id. * Prefer extending AbstractComponent instead of implementing this interface directly. * diff --git a/component/src/main/java/com/yahoo/component/ComponentId.java b/component/src/main/java/com/yahoo/component/ComponentId.java index b0f7206785d..e1e1b43c08a 100644 --- a/component/src/main/java/com/yahoo/component/ComponentId.java +++ b/component/src/main/java/com/yahoo/component/ComponentId.java @@ -9,7 +9,7 @@ import java.util.concurrent.atomic.AtomicInteger; * This is an immutable value object. * * @author bratseth - * @author tonytv + * @author Tony Vaagenes */ public final class ComponentId implements Comparable<ComponentId> { diff --git a/component/src/main/java/com/yahoo/component/ComponentSpecification.java b/component/src/main/java/com/yahoo/component/ComponentSpecification.java index 341136391ce..a27f66dea21 100644 --- a/component/src/main/java/com/yahoo/component/ComponentSpecification.java +++ b/component/src/main/java/com/yahoo/component/ComponentSpecification.java @@ -7,9 +7,10 @@ package com.yahoo.component; * This is an immutable value object * * @author Arne Bergene Fossaa - * @author tonytv + * @author Tony Vaagenes */ public final class ComponentSpecification { + private final class VersionHandler implements Spec.VersionHandler<VersionSpecification> { @Override public VersionSpecification emptyVersion() { @@ -157,4 +158,5 @@ public final class ComponentSpecification { return getNamespace().equals(otherNamespace); } } + } diff --git a/component/src/main/java/com/yahoo/component/Spec.java b/component/src/main/java/com/yahoo/component/Spec.java index f8df736d2a7..d4fc68324b7 100644 --- a/component/src/main/java/com/yahoo/component/Spec.java +++ b/component/src/main/java/com/yahoo/component/Spec.java @@ -6,7 +6,7 @@ import static com.yahoo.container.util.Util.firstNonNull; /** * Code common to ComponentId and ComponentSpecification * - * @author tonytv + * @author Tony Vaagenes */ final class Spec<VERSION> { @@ -93,4 +93,5 @@ final class Spec<VERSION> { return n1.compareTo(n2); } + } diff --git a/component/src/main/java/com/yahoo/component/SpecSplitter.java b/component/src/main/java/com/yahoo/component/SpecSplitter.java index f21850ac387..07d5c573140 100644 --- a/component/src/main/java/com/yahoo/component/SpecSplitter.java +++ b/component/src/main/java/com/yahoo/component/SpecSplitter.java @@ -5,11 +5,12 @@ import java.util.Arrays; import java.util.List; /** - * Splits and component id or component specification string - * into their constituent parts. - * @author tonytv + * Splits and component id or component specification string into their constituent parts. + * + * @author Tony Vaagenes */ class SpecSplitter { + final String name; final String version; final ComponentId namespace; @@ -41,4 +42,5 @@ class SpecSplitter { return Arrays.asList(string, null); } } + } diff --git a/component/src/main/java/com/yahoo/component/Version.java b/component/src/main/java/com/yahoo/component/Version.java index 4d9e43bdf08..d97ecc3e1e7 100644 --- a/component/src/main/java/com/yahoo/component/Version.java +++ b/component/src/main/java/com/yahoo/component/Version.java @@ -115,8 +115,7 @@ public final class Version implements Comparable<Version> { * </pre> * * @param versionString String representation of the version identifier - * @throws IllegalArgumentException If <code>version</code> is improperly - * formatted. + * @throws IllegalArgumentException If <code>version</code> is improperly formatted. */ public Version(String versionString) { if (! "".equals(versionString)) { @@ -378,8 +377,8 @@ public final class Version implements Comparable<Version> { if (this == emptyVersion) return VersionSpecification.emptyVersionSpecification; else { - return new VersionSpecification(getMajor(), getMinor(), getMicro(), - getQualifier()); + return new VersionSpecification(getMajor(), getMinor(), getMicro(), getQualifier()); } } + } diff --git a/component/src/main/java/com/yahoo/component/provider/ComponentClass.java b/component/src/main/java/com/yahoo/component/provider/ComponentClass.java index 7d22f4ee50e..25c27128786 100644 --- a/component/src/main/java/com/yahoo/component/provider/ComponentClass.java +++ b/component/src/main/java/com/yahoo/component/provider/ComponentClass.java @@ -20,6 +20,7 @@ import java.util.logging.Logger; * @author bratseth */ public class ComponentClass<T extends AbstractComponent> { + private static Logger log = Logger.getLogger(ComponentClass.class.getName()); private final Class<T> clazz; diff --git a/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java b/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java index 26ecfa881be..03b0285639f 100644 --- a/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java +++ b/component/src/main/java/com/yahoo/component/provider/ComponentRegistry.java @@ -31,8 +31,7 @@ import java.util.Set; public class ComponentRegistry<COMPONENT> { /** All versions of all components, indexed by name and namespace */ - private Map<ComponentId, Map<String, Map<Version, COMPONENT>>> componentsByNameByNamespace = - new LinkedHashMap<>(); + private Map<ComponentId, Map<String, Map<Version, COMPONENT>>> componentsByNameByNamespace = new LinkedHashMap<>(); /** All versions of all components indexed by id */ private Map<ComponentId, COMPONENT> componentsById =new LinkedHashMap<>(); diff --git a/component/src/main/java/com/yahoo/component/provider/Freezable.java b/component/src/main/java/com/yahoo/component/provider/Freezable.java index 42988480b9e..e2a50e510ca 100644 --- a/component/src/main/java/com/yahoo/component/provider/Freezable.java +++ b/component/src/main/java/com/yahoo/component/provider/Freezable.java @@ -14,7 +14,7 @@ public interface Freezable { * structures and dependent objects. Overrides must call super. * Calling freeze on an already frozen class must have no effect. */ - public void freeze(); + void freeze(); /** @@ -25,5 +25,6 @@ public interface Freezable { * @return true if this instance is in an immutable state, false otherwise * @since 5.1.4 */ - public boolean isFrozen(); + boolean isFrozen(); + } diff --git a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java index 6c1c5c11a9f..e0c01b66785 100644 --- a/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java +++ b/component/src/main/java/com/yahoo/component/provider/ListenableFreezable.java @@ -5,11 +5,10 @@ package com.yahoo.component.provider; * A freezable which supports listening * * @author bratseth - * @since 5.1.13 */ public interface ListenableFreezable extends Freezable { /** Adds a listener which will be called when this is frozen */ - public void addFreezeListener(java.lang.Runnable runnable, java.util.concurrent.Executor executor); + void addFreezeListener(java.lang.Runnable runnable, java.util.concurrent.Executor executor); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java index e15d09cc6db..df5f2e844af 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexingDocprocChain.java @@ -15,7 +15,7 @@ import java.util.HashMap; import java.util.List; /** - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class IndexingDocprocChain extends DocprocChain implements SpecialtokensConfig.Producer { diff --git a/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java b/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java index 99a64b1856f..d07b60ec51b 100644 --- a/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java +++ b/docprocs/src/main/java/com/yahoo/docprocs/indexing/IndexingProcessor.java @@ -19,7 +19,7 @@ import com.yahoo.vespa.indexinglanguage.SimpleAdapterFactory; import com.yahoo.vespa.indexinglanguage.expressions.Expression; /** - * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> + * @author Simon Thoresen */ @Provides({ IndexingProcessor.PROVIDED_NAME }) @Before({ IndexingProcessor.INDEXING_END }) @@ -117,4 +117,5 @@ public class IndexingProcessor extends DocumentProcessor { log.log(LogLevel.DEBUG, "Not processing remove '%s'.", prev.getId()); out.add(prev); } + } diff --git a/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java index 5235aee8cc6..2ac53bdb963 100644 --- a/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java +++ b/vespajlib/src/main/java/com/yahoo/concurrent/Locks.java @@ -51,7 +51,7 @@ public class Locks<TYPE> { public Lock lock(TYPE key, long timeout, TimeUnit timeoutUnit) { try { ReentrantLock lock = locks.computeIfAbsent(key, k -> new ReentrantLock(true)); - boolean acquired = lock.tryLock(timeoutMs, TimeUnit.MILLISECONDS); + boolean acquired = lock.tryLock(timeout, TimeUnit.MILLISECONDS); if ( ! acquired) throw new UncheckedTimeoutException("Timed out waiting for the lock to " + key); return new Lock(lock); |