Merge with master

7 files changed, 29 insertions, 12 deletions

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();
+
 }