AllocatedHost serialization completeness

- Serialize node resources instead of flavor when appropriate
- Serialize aliases
- Proper (de)serialization testing

2 files changed, 8 insertions, 9 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
index cb3308d75bf..35d82efa553 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/AbstractService.java
@@ -250,19 +250,17 @@ public abstract class AbstractService extends AbstractConfigProducer<AbstractCon
         return Optional.empty();
     }
 
-    /**
-     * Returns the name that identifies this service for the config-sentinel.
-     *
-     * @return the name that identifies this service for the config-sentinel.
-     */
+    /** Returns the name that identifies this service for the config-sentinel, never null */
+    @Override
     public String getServiceName() {
         return getServiceType() + ((id == 1) ? "" : Integer.toString(id));
     }
 
     /**
      * Returns the type of service. This is the class name without the
-     * package prefix by default.
+     * package prefix by default, never null
      */
+    @Override
     public String getServiceType() {
         return toLowerCase(getShortClassName());
     }
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java b/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
index 52319f71810..4d64ece1c77 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/NetworkPortRequestor.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.model;
 
 /**
  * Interface implemented by services using network ports, identifying its requirements.
+ *
  * @author arnej
  */
 public interface NetworkPortRequestor {
@@ -11,10 +12,10 @@ public interface NetworkPortRequestor {
     /** Returns the type of service */
     String getServiceType();
 
-   /** Returns the name that identifies this service for the config-sentinel */
+   /** Returns the name that identifies this service for the config-sentinel, never null */
     String getServiceName();
 
-    /** Returns the config id */
+    /** Returns the config id, never null */
     String getConfigId();
 
     /**
@@ -48,6 +49,6 @@ public interface NetworkPortRequestor {
     /**
      * Return names for each port requested.
      * The size of the returned array must be equal to getPortCount().
-     **/
+     */
     String[] getPortSuffixes();
 }