Some doc, cleanup of modifiers and @Override, a TODO

3 files changed, 10 insertions, 6 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/RegionName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/RegionName.java
index b98020c260b..95c80be1fc1 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/RegionName.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/RegionName.java
@@ -34,6 +34,7 @@ public class RegionName implements Comparable<RegionName> {
         return region;
     }
 
+    // TODO: Add verification of region name.
     public static RegionName from(String region) {
         return new RegionName(region);
     }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
index 4dd6324b423..26c20d56d63 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Zone.java
@@ -46,7 +46,7 @@ public class Zone {
                  RegionName region,
                  FlavorDefaults flavorDefaults,
                  NodeFlavors nodeFlavors) {
-        this.id = new ZoneId(environment, region);
+        this.id = ZoneId.from(environment, region);
         this.flavorDefaults = flavorDefaults;
         this.systemName = systemName;
         this.nodeFlavors = Optional.ofNullable(nodeFlavors);
@@ -81,7 +81,7 @@ public class Zone {
         return new Zone(SystemName.defaultSystem(), Environment.defaultEnvironment(), RegionName.defaultName());
     }
 
-
+    @Override
     public String toString() {
         return id.toString();
     }
@@ -93,6 +93,7 @@ public class Zone {
         return Objects.equals(id, ((Zone) o).id);
     }
 
+    @Override
     public int hashCode() {
         return id.hashCode();
     }
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java
index e1565bfb0e1..d51a8d5e0c9 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ZoneId.java
@@ -11,11 +11,12 @@ import java.util.Objects;
  * @author jvenstad
  */
 public class ZoneId {
+    // TODO: Replace usages of zone + region with usages of this.
 
-    protected final Environment environment;
-    protected final RegionName region;
+    private final Environment environment;
+    private final RegionName region;
 
-    ZoneId(Environment environment, RegionName region) {
+    private ZoneId(Environment environment, RegionName region) {
         this.environment = Objects.requireNonNull(environment);
         this.region = Objects.requireNonNull(region);
     }
@@ -27,7 +28,7 @@ public class ZoneId {
     public static ZoneId from(String environment, String region) {
         return from(Environment.from(environment), RegionName.from(region));
     }
-
+    /** Create from a serialised ZoneId. Inverse of {@code ZoneId.value()}. */
     public static ZoneId from(String value) {
         String[] parts = value.split("\\.");
         return from(parts[0], parts[1]);
@@ -41,6 +42,7 @@ public class ZoneId {
         return region;
     }
 
+    /** Returns the serialised value of this. Inverse of {@code ZoneId.from(String value)}. */
     public String value() {
         return environment + "." + region;
     }