From 3f6b1ec1cb717732dc020b3597f23f0c84e5c7b4 Mon Sep 17 00:00:00 2001 From: Valerij Fredriksen Date: Fri, 20 Apr 2018 12:06:25 +0200 Subject: Make variables private, add getters --- .../application/ConfigServerApplication.java | 6 +++--- .../monitor/application/HostedVespaApplication.java | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) (limited to 'service-monitor/src') diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java index 95b4ac9db17..4001c93aa69 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/ConfigServerApplication.java @@ -25,10 +25,10 @@ import java.util.stream.Stream; public class ConfigServerApplication extends HostedVespaApplication { public static final ConfigServerApplication CONFIG_SERVER_APPLICATION = new ConfigServerApplication(); - public static final TenantId TENANT_ID = new TenantId(CONFIG_SERVER_APPLICATION.applicationId.tenant().value()); + public static final TenantId TENANT_ID = new TenantId(CONFIG_SERVER_APPLICATION.getApplicationId().tenant().value()); public static final ApplicationInstanceId APPLICATION_INSTANCE_ID = - new ApplicationInstanceId(CONFIG_SERVER_APPLICATION.applicationId.application().value()); - public static final ClusterId CLUSTER_ID = new ClusterId(CONFIG_SERVER_APPLICATION.clusterId.value()); + new ApplicationInstanceId(CONFIG_SERVER_APPLICATION.getApplicationId().application().value()); + public static final ClusterId CLUSTER_ID = new ClusterId(CONFIG_SERVER_APPLICATION.getClusterId().value()); public static final ServiceType SERVICE_TYPE = new ServiceType("configserver"); public static final String CONFIG_ID_PREFIX = "configid."; diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java index 355a5b238d6..efb060d624c 100644 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java +++ b/service-monitor/src/main/java/com/yahoo/vespa/service/monitor/application/HostedVespaApplication.java @@ -15,11 +15,11 @@ public abstract class HostedVespaApplication { public static final TenantName TENANT_NAME = TenantName.from("hosted-vespa"); - protected final ApplicationId applicationId; - protected final Capacity capacity; - protected final ClusterSpec.Type clusterType; - protected final ClusterSpec.Id clusterId; - protected final ClusterSpec.Group clusterGroup; + private final ApplicationId applicationId; + private final Capacity capacity; + private final ClusterSpec.Type clusterType; + private final ClusterSpec.Id clusterId; + private final ClusterSpec.Group clusterGroup; protected HostedVespaApplication(String applicationName, NodeType nodeType, ClusterSpec.Type clusterType, ClusterSpec.Id clusterId, ClusterSpec.Group clusterGroup) { @@ -47,6 +47,17 @@ public abstract class HostedVespaApplication { return ClusterSpec.from(clusterType, clusterId, clusterGroup, version, true); } + public ClusterSpec.Type getClusterType() { + return clusterType; + } + + public ClusterSpec.Id getClusterId() { + return clusterId; + } + + public ClusterSpec.Group getClusterGroup() { + return clusterGroup; + } public static ApplicationId createHostedVespaApplicationId(String applicationName) { return new ApplicationId.Builder() -- cgit v1.2.3