Revert "Return 409 with error code TRANSIENT_ERROR when getting TransientExce…"

8 files changed, 64 insertions, 27 deletions

diff --git a/config-provisioning/abi-spec.json b/config-provisioning/abi-spec.json
index 9742f381ae1..33c02811318 100644
--- a/config-provisioning/abi-spec.json
+++ b/config-provisioning/abi-spec.json
@@ -61,6 +61,17 @@
     ],
     "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": [
@@ -136,6 +147,17 @@
     ],
     "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": [
@@ -629,6 +651,28 @@
       "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": [],
@@ -740,6 +784,19 @@
     ],
     "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/ApplicationLockException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationLockException.java
index 9e9fe83c478..e9fe669269c 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/ApplicationLockException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationLockException.java
@@ -1,5 +1,5 @@
-// 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;
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.config.provision;
 
 /**
  *
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/CertificateNotReadyException.java
index fccc95f49c6..0d88a7aa435 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/CertificateNotReadyException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/CertificateNotReadyException.java
@@ -1,5 +1,5 @@
 // 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;
+package com.yahoo.config.provision;
 
 /**
  * Exception thrown when trying to validate an application which is configured
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/OutOfCapacityException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/OutOfCapacityException.java
index 1ff9bef2b62..896f29d7cca 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/OutOfCapacityException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/OutOfCapacityException.java
@@ -1,5 +1,5 @@
-// 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;
+// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.config.provision;
 
 /**
  *
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/ParentHostUnavailableException.java
index b955d20dfa5..f90b67c1525 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/ParentHostUnavailableException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostUnavailableException.java
@@ -1,5 +1,5 @@
 // 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;
+package com.yahoo.config.provision;
 
 /**
  *
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/TransientException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/TransientException.java
index 822e722f5d9..bae7407587e 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/TransientException.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/TransientException.java
@@ -1,5 +1,5 @@
 // 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;
+package com.yahoo.config.provision;
 
 /**
  * A provisioning exception that is considered transient. Exceptions that we expect to recover from after a short
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/LoadBalancerServiceException.java b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/LoadBalancerServiceException.java
deleted file mode 100644
index eb89a710534..00000000000
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/LoadBalancerServiceException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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;
-
-/**
- * Transient exception thrown on behalf of a load balancer service
- *
- * @author mpolden
- */
-public class LoadBalancerServiceException extends TransientException {
-
-    public LoadBalancerServiceException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-}
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/package-info.java b/config-provisioning/src/main/java/com/yahoo/config/provision/exception/package-info.java
deleted file mode 100644
index 5730f3fdb6b..00000000000
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/exception/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-@ExportPackage
-package com.yahoo.config.provision.exception;
-
-import com.yahoo.osgi.annotation.ExportPackage;