Revert "Pass around orchestration parameters"

2 files changed, 1 insertions, 22 deletions

diff --git a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
index c53d47ee6a3..1bdf1ff67d9 100644
--- a/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
+++ b/service-monitor/src/main/java/com/yahoo/vespa/service/duper/InfraApplication.java
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
  */
 public abstract class InfraApplication implements InfraApplicationApi {
 
-    static final TenantName TENANT_NAME = TenantName.from("hosted-vespa");
+    private static final TenantName TENANT_NAME = TenantName.from("hosted-vespa");
 
     private final ApplicationId applicationId;
     private final Capacity capacity;
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;
-    }
-}