diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-08-01 12:52:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-01 12:52:59 +0200 |
commit | 318fc77cf4d4bab4c4a7dd134c92edc77964e37d (patch) | |
tree | aa495412e3e158120410524d04b9fae3e4e95d82 /config-provisioning/src/main/java/com | |
parent | b3cff606d0314b6815a7800f263aa47aad99d5f4 (diff) |
Revert "Return 409 with error code TRANSIENT_ERROR when getting TransientExce…"
Diffstat (limited to 'config-provisioning/src/main/java/com')
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationLockException.java (renamed from config-provisioning/src/main/java/com/yahoo/config/provision/exception/ApplicationLockException.java) | 4 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/CertificateNotReadyException.java (renamed from config-provisioning/src/main/java/com/yahoo/config/provision/exception/CertificateNotReadyException.java) | 2 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/OutOfCapacityException.java (renamed from config-provisioning/src/main/java/com/yahoo/config/provision/exception/OutOfCapacityException.java) | 4 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/ParentHostUnavailableException.java (renamed from config-provisioning/src/main/java/com/yahoo/config/provision/exception/ParentHostUnavailableException.java) | 2 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/TransientException.java (renamed from config-provisioning/src/main/java/com/yahoo/config/provision/exception/TransientException.java) | 2 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/exception/LoadBalancerServiceException.java | 15 | ||||
-rw-r--r-- | config-provisioning/src/main/java/com/yahoo/config/provision/exception/package-info.java | 5 |
7 files changed, 7 insertions, 27 deletions
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; |