diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-07-29 15:40:34 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2021-07-29 15:40:34 +0200 |
commit | cf8fe2952ef7133d9fa4d769d8dec47984422734 (patch) | |
tree | 85132dee349ab4ce413920b4573621ae5bfc78fe | |
parent | 8eb4c2dd3aa750c2ebcee4e1736f99e98d89c3bf (diff) |
Avoid references to unexported classes
-rw-r--r-- | orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaOrchestration.java | 19 | ||||
-rw-r--r-- | service-monitor/src/main/java/com/yahoo/vespa/service/duper/ProxyApplication.java | 21 |
2 files changed, 7 insertions, 33 deletions
diff --git a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaOrchestration.java b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaOrchestration.java index d444f922f82..e9a27cddaeb 100644 --- a/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaOrchestration.java +++ b/orchestrator/src/main/java/com/yahoo/vespa/orchestrator/policy/HostedVespaOrchestration.java @@ -2,14 +2,9 @@ package com.yahoo.vespa.orchestrator.policy; import com.yahoo.cloud.config.ConfigserverConfig; +import com.yahoo.config.provision.ApplicationId; import com.yahoo.vespa.applicationmodel.ClusterId; import com.yahoo.vespa.applicationmodel.ServiceType; -import com.yahoo.vespa.service.duper.ConfigServerApplication; -import com.yahoo.vespa.service.duper.ConfigServerHostApplication; -import com.yahoo.vespa.service.duper.ControllerApplication; -import com.yahoo.vespa.service.duper.ControllerHostApplication; -import com.yahoo.vespa.service.duper.ProxyApplication; -import com.yahoo.vespa.service.duper.ProxyHostApplication; /** * Creates orchestration parameters for hosted Vespa. @@ -30,7 +25,7 @@ public class HostedVespaOrchestration { return new OrchestrationParams.Builder() // Controller host - .addApplicationParams(new ControllerHostApplication().getApplicationId(), + .addApplicationParams(ApplicationId.fromSerializedForm("hosted-vespa:controller-host:default"), new ApplicationParams .Builder() .add(ClusterId.CONTROLLER, @@ -42,7 +37,7 @@ public class HostedVespaOrchestration { .build()) // Controller - .addApplicationParams(new ControllerApplication().getApplicationId(), + .addApplicationParams(ApplicationId.fromSerializedForm("hosted-vespa:controller:default"), new ApplicationParams .Builder() .add(ClusterId.CONTROLLER, @@ -54,7 +49,7 @@ public class HostedVespaOrchestration { .build()) // Config server host - .addApplicationParams(new ConfigServerHostApplication().getApplicationId(), + .addApplicationParams(ApplicationId.fromSerializedForm("hosted-vespa:configserver-host:default"), new ApplicationParams .Builder() .add(ClusterId.CONFIG_SERVER_HOST, @@ -66,7 +61,7 @@ public class HostedVespaOrchestration { .build()) // Config server - .addApplicationParams(new ConfigServerApplication().getApplicationId(), + .addApplicationParams(ApplicationId.fromSerializedForm("hosted-vespa:zone-config-servers:default"), new ApplicationParams .Builder() .add(ClusterId.CONFIG_SERVER, @@ -78,7 +73,7 @@ public class HostedVespaOrchestration { .build()) // Proxy host - .addApplicationParams(new ProxyHostApplication().getApplicationId(), + .addApplicationParams(ApplicationId.fromSerializedForm("hosted-vespa:proxy-host:default"), new ApplicationParams .Builder() .add(ClusterId.PROXY_HOST, @@ -90,7 +85,7 @@ public class HostedVespaOrchestration { .build()) // Proxy - .addApplicationParams(new ProxyApplication().getApplicationId(), + .addApplicationParams(ApplicationId.fromSerializedForm("hosted-vespa:routing:default"), new ApplicationParams .Builder() .add(ClusterId.ROUTING, diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ProxyApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ProxyApplication.java deleted file mode 100644 index 7bc4facbfa8..00000000000 --- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/ProxyApplication.java +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.vespa.service.duper; - -import com.yahoo.config.provision.ApplicationId; - -/** - * The proxy application is an ordinary non-infrastructure application. Still, it may be useful - * to refer to e.g. the ApplicationId of the proxy application, hence this class. - * - * @author hakonhall - */ -public class ProxyApplication { - private static final ApplicationId APPLICATION_ID = new ApplicationId.Builder() - .tenant(InfraApplication.TENANT_NAME) - .applicationName("routing") - .build(); - - public ApplicationId getApplicationId() { - return APPLICATION_ID; - } -} |