Merge remote-tracking branch 'origin/master' into ogronnesby/let-plugin-get-key-as-parameter

Conflicts:
	hosted-api/src/main/java/ai/vespa/hosted/api/Properties.java

1 files changed, 5 insertions, 5 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
index 0059b761734..1fc1e19e3ee 100644
--- a/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
+++ b/container-search/src/main/java/com/yahoo/search/query/profile/DimensionBinding.java
@@ -21,7 +21,7 @@ public class DimensionBinding {
     private DimensionValues values;
 
     /** The binding from those dimensions to values, and possibly other values */
-    private Map<String,String> context;
+    private Map<String, String> context;
 
     public static final DimensionBinding nullBinding =
         new DimensionBinding(Collections.unmodifiableList(Collections.emptyList()), DimensionValues.empty, null);
@@ -195,11 +195,11 @@ public class DimensionBinding {
     @Override
     public String toString() {
         if (isInvalid()) return "Invalid DimensionBinding";
-        if (dimensions==null) return "DimensionBinding []";
-        StringBuilder b=new StringBuilder("DimensionBinding [");
-        for (int i=0; i<dimensions.size(); i++) {
+        if (dimensions == null) return "DimensionBinding []";
+        StringBuilder b = new StringBuilder("DimensionBinding [");
+        for (int i = 0; i < dimensions.size(); i++) {
             b.append(dimensions.get(i)).append("=").append(values.get(i));
-            if (i<dimensions.size()-1)
+            if (i < dimensions.size()-1)
                 b.append(", ");
         }
         b.append("]");