summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config-provisioning/abi-spec.json57
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/exception/CertificateNotReadyException.java2
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/exception/LoadBalancerServiceException.java (renamed from node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceException.java)6
-rw-r--r--config-provisioning/src/main/java/com/yahoo/config/provision/exception/ParentHostUnavailableException.java2
-rw-r--r--node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java2
5 files changed, 3 insertions, 66 deletions
diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 33c02811318..9742f381ae1 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -61,17 +61,6 @@
],
"fields": []
},
- "com.yahoo.config.provision.ApplicationLockException": {
- "superClass": "java.lang.RuntimeException",
- "interfaces": [],
- "attributes": [
- "public"
- ],
- "methods": [
- "public void <init>(java.lang.Exception)"
- ],
- "fields": []
- },
"com.yahoo.config.provision.ApplicationName": {
"superClass": "java.lang.Object",
"interfaces": [
@@ -147,17 +136,6 @@
],
"fields": []
},
- "com.yahoo.config.provision.CertificateNotReadyException": {
- "superClass": "com.yahoo.config.provision.TransientException",
- "interfaces": [],
- "attributes": [
- "public"
- ],
- "methods": [
- "public void <init>(java.lang.String)"
- ],
- "fields": []
- },
"com.yahoo.config.provision.CloudName": {
"superClass": "java.lang.Object",
"interfaces": [
@@ -651,28 +629,6 @@
"public static final enum com.yahoo.config.provision.NodeType controllerhost"
]
},
- "com.yahoo.config.provision.OutOfCapacityException": {
- "superClass": "java.lang.RuntimeException",
- "interfaces": [],
- "attributes": [
- "public"
- ],
- "methods": [
- "public void <init>(java.lang.String)"
- ],
- "fields": []
- },
- "com.yahoo.config.provision.ParentHostUnavailableException": {
- "superClass": "com.yahoo.config.provision.TransientException",
- "interfaces": [],
- "attributes": [
- "public"
- ],
- "methods": [
- "public void <init>(java.lang.String)"
- ],
- "fields": []
- },
"com.yahoo.config.provision.ProvisionLogger": {
"superClass": "java.lang.Object",
"interfaces": [],
@@ -784,19 +740,6 @@
],
"fields": []
},
- "com.yahoo.config.provision.TransientException": {
- "superClass": "java.lang.RuntimeException",
- "interfaces": [],
- "attributes": [
- "public",
- "abstract"
- ],
- "methods": [
- "public void <init>(java.lang.String)",
- "public void <init>(java.lang.String, java.lang.Throwable)"
- ],
- "fields": []
- },
"com.yahoo.config.provision.Zone": {
"superClass": "java.lang.Object",
"interfaces": [],
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/CertificateNotReadyException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/CertificateNotReadyException.java
index b5e2230d7f0..fccc95f49c6 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/CertificateNotReadyException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/CertificateNotReadyException.java
@@ -1,8 +1,6 @@
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.config.provision.exception;
-import com.yahoo.config.provision.exception.TransientException;
-
/**
* Exception thrown when trying to validate an application which is configured
* with a certificate that is not yet retrievable
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/LoadBalancerServiceException.java
index 777f476a5a7..eb89a710534 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/lb/LoadBalancerServiceException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/LoadBalancerServiceException.java
@@ -1,10 +1,8 @@
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.provision.lb;
-
-import com.yahoo.config.provision.exception.TransientException;
+package com.yahoo.config.provision.exception;
/**
- * Transient exception thrown on behalf of a {@link LoadBalancerService}.
+ * Transient exception thrown on behalf of a load balancer service
*
* @author mpolden
*/
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/ParentHostUnavailableException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/ParentHostUnavailableException.java
index 34eadbfc593..b955d20dfa5 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/ParentHostUnavailableException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/ParentHostUnavailableException.java
@@ -1,8 +1,6 @@
// Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.config.provision.exception;
-import com.yahoo.config.provision.exception.TransientException;
-
/**
*
* Exception thrown when trying to activate a node that runs on a host that is not
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
index 4f0081b6a7f..ea30fba9798 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/LoadBalancerProvisioner.java
@@ -14,7 +14,7 @@ import com.yahoo.vespa.hosted.provision.NodeRepository;
import com.yahoo.vespa.hosted.provision.lb.LoadBalancer;
import com.yahoo.vespa.hosted.provision.lb.LoadBalancerId;
import com.yahoo.vespa.hosted.provision.lb.LoadBalancerInstance;
-import com.yahoo.vespa.hosted.provision.lb.LoadBalancerServiceException;
+import com.yahoo.config.provision.exception.LoadBalancerServiceException;
import com.yahoo.vespa.hosted.provision.lb.LoadBalancerService;
import com.yahoo.vespa.hosted.provision.lb.Real;
import com.yahoo.vespa.hosted.provision.node.IP;