diff options
| author | gjoranv <gv@verizonmedia.com> | 2019-03-01 17:03:37 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2019-03-04 13:39:04 +0100 |
| commit | e466acbcc0a5fdcb44ccb7e5eebc82799afd0adf (patch) | |
| tree | c61bfe01ee6abf9e29ad0ea0422989ee6fe2369e | |
| parent | 22175435a10e5f54058b75548d260c40e27b61d6 (diff) | |
Rename name field to avoid confusion with Enum's 'name()'
| -rw-r--r-- | config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java | 6 | ||||
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/Container.java | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java b/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java index 5d168d2882a..0b521881838 100644 --- a/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java +++ b/config-model-api/src/main/java/com/yahoo/config/model/api/container/ContainerServiceType.java @@ -12,10 +12,10 @@ public enum ContainerServiceType { LOGSERVER_CONTAINER("logserver-container"), METRICS_PROXY_CONTAINER("metrics-proxy-container"); - public final String name; + public final String serviceName; - ContainerServiceType(String name) { - this.name = name; + ContainerServiceType(String serviceName) { + this.serviceName = serviceName; } } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java index 698f606b2c7..414125f3cc4 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/Container.java @@ -198,7 +198,7 @@ public abstract class Container extends AbstractService implements if (myServiceType == null) { myServiceType = myServiceType(); } - return myServiceType.name; + return myServiceType.serviceName; } /** Subclasses must implement this for a custom service name. */ |