summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-06-24 13:11:00 +0200
committerJon Bratseth <bratseth@gmail.com>2020-06-24 13:11:00 +0200
commit9847afaf25500caf513b0183cfbcc22a6de58a80 (patch)
treee3c6a733cd82aa212325471bff48595ded416193
parentb9408860c807b06824e9eb58d40a369d8632ff06 (diff)
Nonfunctional, changes only
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java2
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/Request.java6
-rw-r--r--jdisc_core/src/main/java/com/yahoo/jdisc/handler/ResponseHandler.java8
-rw-r--r--messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java4
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java2
5 files changed, 10 insertions, 12 deletions
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
index 24ec4a7ab70..0899a6f1007 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Cloud.java
@@ -36,7 +36,7 @@ public class Cloud {
return dynamicProvisioning;
}
- /** Returns wheter this allows different applications to share the same host */
+ /** Returns whether this allows different applications to share the same host */
public boolean allowHostSharing() {
return allowHostSharing;
}
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
index 25194a5502a..e0292bbe026 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/Request.java
@@ -123,13 +123,11 @@ public class Request extends AbstractResource {
/**
* Returns the Uniform Resource Identifier used by the {@link Container} to resolve the appropriate {@link
- * RequestHandler} for this Request
+ * RequestHandler} for this Request.
*
* @see #setUri(URI)
*/
- public URI getUri() {
- return uri;
- }
+ public URI getUri() { return uri; }
/**
* Sets the Uniform Resource Identifier used by the {@link Container} to resolve the appropriate {@link
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ResponseHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ResponseHandler.java
index 9451191a31c..57d9402de5f 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ResponseHandler.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/ResponseHandler.java
@@ -20,11 +20,11 @@ import com.yahoo.jdisc.service.ClientProvider;
public interface ResponseHandler {
/**
- * <p>This method will process the given {@link Response} and return a {@link ContentChannel} into which the caller
- * can write the Response's content.</p>
+ * This method will process the given {@link Response} and return a {@link ContentChannel} into which the caller
+ * can write the Response's content.
*
- * @param response The Response to handle.
- * @return The ContentChannel to write the Response content to. Notice that the ContentChannel holds a Container
+ * @param response the Response to handle
+ * @return the ContentChannel to write the Response content to. Notice that the ContentChannel holds a Container
* reference, so failure to close this will prevent the Container from ever shutting down.
*/
ContentChannel handleResponse(Response response);
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java b/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java
index 6d1ec7586b3..39fc9aa8314 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/Sequencer.java
@@ -59,8 +59,8 @@ public class Sequencer implements MessageHandler, ReplyHandler {
* queued for later sending due to sequencing restrictions. This method also sets the sequence id as message
* context.
*
- * @param msg The message to filter.
- * @return True if the message was consumed.
+ * @param msg the message to filter
+ * @return true if the message was consumed
*/
private boolean filter(Message msg) {
long seqId = msg.getSequenceId();
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
index 44bfed90106..0a32970e056 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/maintenance/DynamicProvisioningMaintainer.java
@@ -110,7 +110,7 @@ public class DynamicProvisioningMaintainer extends NodeRepositoryMaintainer {
/**
* Provision the nodes necessary to satisfy given capacity.
*
- * @return Excess hosts that can safely be deprovisioned, if any.
+ * @return excess hosts that can safely be deprovisioned, if any
*/
private List<Node> provision(List<NodeResources> capacity, NodeList nodes) {
List<Node> existingHosts = availableHostsOf(nodes);