Merge pull request #10954 from vespa-engine/bratseth/string-bucket-convenience-constructor

Bratseth/string bucket convenience constructor

10 files changed, 42 insertions, 38 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index b41bf96332d..dc9dc80fddf 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -735,7 +735,8 @@
       "public void <init>(java.lang.String)",
       "public java.lang.String getId()",
       "public boolean equals(java.lang.Object)",
-      "public int hashCode()"
+      "public int hashCode()",
+      "public java.lang.String toString()"
     ],
     "fields": []
   },
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java
index 7eaebbe848a..75b7d790eba 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Rotation.java
@@ -1,11 +1,10 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.config.provision;
 
-
 import java.util.Objects;
 
 /**
- * A Brooklyn rotation, e.g. rotation-042.vespa.a02.yahoodns.net.
+ * A rotation (virtual endpoint).
  */
 public class Rotation {
 
@@ -36,4 +35,9 @@ public class Rotation {
         return id.hashCode();
     }
 
+    @Override
+    public String toString() {
+        return "rotation '" + id + "'";
+    }
+
 }
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
index 5bf70c55f9e..a21e12a5d42 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/PrepareParams.java
@@ -49,8 +49,9 @@ public final class PrepareParams {
     private final Optional<String> tlsSecretsKeyName;
 
     private PrepareParams(ApplicationId applicationId, TimeoutBudget timeoutBudget, boolean ignoreValidationErrors,
-                          boolean dryRun, boolean verbose, boolean isBootstrap, Optional<Version> vespaVersion, Set<Rotation> rotations,
-			  List<ContainerEndpoint> containerEndpoints, Optional<String> tlsSecretsKeyName) {
+                          boolean dryRun, boolean verbose, boolean isBootstrap, Optional<Version> vespaVersion,
+                          Set<Rotation> rotations, List<ContainerEndpoint> containerEndpoints,
+                          Optional<String> tlsSecretsKeyName) {
         this.timeoutBudget = timeoutBudget;
         this.applicationId = applicationId;
         this.ignoreValidationErrors = ignoreValidationErrors;
@@ -140,8 +141,8 @@ public final class PrepareParams {
             if (serialized == null) return this;
             Slime slime = SlimeUtils.jsonToSlime(serialized);
             containerEndpoints = ContainerEndpointSerializer.endpointListFromSlime(slime);
-	    return this;
-	}
+            return this;
+        }
 
         public Builder tlsSecretsKeyName(String tlsSecretsKeyName) {
             this.tlsSecretsKeyName = Optional.ofNullable(tlsSecretsKeyName)
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 3ec74a4c3eb..bdd3254e82d 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -79,7 +79,7 @@ public class SessionPreparer {
     public SessionPreparer(ModelFactoryRegistry modelFactoryRegistry,
                            FileDistributionFactory fileDistributionFactory,
                            HostProvisionerProvider hostProvisionerProvider,
-                           PermanentApplicationPackage permanentApplicationPackage,
+                           PermanentApplicationPackage permanentApplicationPackage,x
                            ConfigserverConfig configserverConfig,
                            ConfigDefinitionRepo configDefinitionRepo,
                            Curator curator,
diff --git a/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java b/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java
index 5558f1443db..c0bea7003c0 100644
--- a/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java
+++ b/container-search/src/main/java/com/yahoo/search/grouping/request/StringBucket.java
@@ -8,31 +8,36 @@ package com.yahoo.search.grouping.request;
  */
 public class StringBucket extends BucketValue {
 
-    /**
-     * Get the next distinct value.
-     *
-     * @param value The base value.
-     * @return the next value.
-     */
+    /** Returns the next distinct value after the given value */
     public static StringValue nextValue(StringValue value) {
         return new StringValue(value.getValue() + " ");
     }
 
+    /** Constructs a new bucket for a single unique string */
+    public StringBucket(String value) {
+        this(new StringValue(value));
+    }
+
+    /** Constructs a new bucket for a single unique string */
+    public StringBucket(StringValue value) {
+        this(value, nextValue(value));
+    }
+
     /**
-     * Constructs a new instance of this class.
+     * Constructs a new bucket for a range of strings.
      *
-     * @param from          The from-value to assign to this.
-     * @param to            The to-value to assign to this.
+     * @param from the start of the bucket, inclusive
+     * @param to the end of the bucket, exclusive
      */
     public StringBucket(String from, String to) {
         super(null, null, new StringValue(from), new StringValue(to));
     }
 
     /**
-     * Constructs a new instance of this class.
+     * Constructs a new bucket for a range of strings.
      *
-     * @param from          The from-value to assign to this.
-     * @param to            The to-value to assign to this.
+     * @param from the start of the bucket, inclusive
+     * @param to the end of the bucket, exclusive
      */
     public StringBucket(ConstantValue<?> from, ConstantValue<?> to) {
         super(null, null, from, to);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
index 627cde28fd0..90fa51fb8f8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Instance.java
@@ -117,18 +117,15 @@ public class Instance {
     }
 
     public Instance withoutDeploymentJob(JobType jobType) {
-        return new Instance(id, deployments.values(), deploymentJobs.without(jobType),
-                            rotations, rotationStatus);
+        return new Instance(id, deployments.values(), deploymentJobs.without(jobType), rotations, rotationStatus);
     }
 
     public Instance with(List<AssignedRotation> assignedRotations) {
-        return new Instance(id, deployments.values(), deploymentJobs,
-                            assignedRotations, rotationStatus);
+        return new Instance(id, deployments.values(), deploymentJobs, assignedRotations, rotationStatus);
     }
 
     public Instance with(RotationStatus rotationStatus) {
-        return new Instance(id, deployments.values(), deploymentJobs,
-                            rotations, rotationStatus);
+        return new Instance(id, deployments.values(), deploymentJobs, rotations, rotationStatus);
     }
 
     private Instance with(Deployment deployment) {
@@ -138,8 +135,7 @@ public class Instance {
     }
 
     private Instance with(Map<ZoneId, Deployment> deployments) {
-        return new Instance(id, deployments.values(), deploymentJobs,
-                            rotations, rotationStatus);
+        return new Instance(id, deployments.values(), deploymentJobs, rotations, rotationStatus);
     }
 
     public ApplicationId id() { return id; }
diff --git a/vespalog/src/main/java/com/yahoo/log/LogSetup.java b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
index 12b1411b17e..1bdefaa52fd 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogSetup.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
@@ -82,7 +82,7 @@ public class LogSetup {
         String logControlDir  = System.getProperty("vespa.log.control.dir");
         String logControlFile = System.getProperty("vespa.log.control.file");
         if (programName == null || programName.equals("")) {
-            throw new RuntimeException("invalid programName: "+programName);
+            throw new RuntimeException("invalid programName: " + programName);
         }
 
         // then try environment values
@@ -165,6 +165,7 @@ public class LogSetup {
      * For other log records, isLoggable returns true
      */
     static class ZooKeeperFilter implements Filter {
+
         private FileHandler fileHandler;
 
         ZooKeeperFilter(String logFile) {
@@ -180,6 +181,7 @@ public class LogSetup {
         /**
          * Return true if loggable (ordinary log record), returns false if this filter
          * logs it itself
+         *
          * @param record a #{@link LogRecord}
          * @return true if loggable, false otherwise
          */
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
index d0dc5607af5..90e16f6408e 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaFormat.java
@@ -48,8 +48,7 @@ public class VespaFormat {
      * value was "(empty)".
      *
      * @param s String that might need escaping
-     * @return Returns escaped string
-     *
+     * @return returns the escaped string
      */
     public static String escape (String s) {
         if (s == null) {
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
index 482d7049079..314e0ae49e6 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaFormatter.java
@@ -92,9 +92,7 @@ public class VespaFormatter extends SimpleFormatter {
     public String format(LogRecord r) {
         StringBuilder sbuf = new StringBuilder(300); // initial guess
 
-        String levelName = LogLevel.getVespaLogLevel(r.getLevel())
-            .toString()
-            .toLowerCase();
+        String levelName = LogLevel.getVespaLogLevel(r.getLevel()).toString().toLowerCase();
 
         String component = r.getLoggerName();
 
@@ -130,7 +128,6 @@ public class VespaFormatter extends SimpleFormatter {
         }
         appendException(r.getThrown(), sbuf);
 
-
         sbuf.append("\n");
         return sbuf.toString();
     }
diff --git a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
index 7eede7e1e35..331780f226b 100644
--- a/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
+++ b/vespalog/src/main/java/com/yahoo/log/VespaLogHandler.java
@@ -7,7 +7,7 @@ import java.util.logging.LogRecord;
 import java.util.logging.StreamHandler;
 
 /**
- * @author  Bjorn Borud
+ * @author Bjorn Borud
  * @author arnej27959
  */
 class VespaLogHandler extends StreamHandler {
@@ -32,8 +32,7 @@ class VespaLogHandler extends StreamHandler {
      * </DL>
      */
     VespaLogHandler(LogTarget logTarget,
-                           LevelControllerRepo levelControllerRepo, String serviceName,
-                           String applicationPrefix) {
+                    LevelControllerRepo levelControllerRepo, String serviceName, String applicationPrefix) {
         this.logTarget = logTarget;
         this.serviceName = serviceName;
         this.appPrefix = applicationPrefix;