remove reference ZMSClientException/ZTSClientException

5 files changed, 14 insertions, 16 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZmsException.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZmsException.java
index 59548339d11..f7f509deeb2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZmsException.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZmsException.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.athenz;
 
-import com.yahoo.athenz.zms.ZMSClientException;
-
 /**
  * @author bjorncs
  */
@@ -10,11 +8,15 @@ public class ZmsException extends RuntimeException {
 
     private final int code;
 
-    public ZmsException(ZMSClientException e) {
-        super(e.getMessage(), e);
-        this.code = e.getCode();
+    public ZmsException(int code, Throwable cause) {
+        super(cause.getMessage(), cause);
+        this.code = code;
     }
 
+    public ZmsException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
 
     public int getCode() {
         return code;
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZtsException.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZtsException.java
index cb0b21ba459..1842420febe 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZtsException.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/ZtsException.java
@@ -1,8 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.athenz;
 
-import com.yahoo.athenz.zts.ZTSClientException;
-
 /**
  * @author bjorncs
  */
@@ -10,12 +8,11 @@ public class ZtsException extends RuntimeException {
 
     private final int code;
 
-    public ZtsException(ZTSClientException e) {
-        super(e.getMessage(), e);
-        this.code = e.getCode();
+    public ZtsException(int code, Throwable cause) {
+        super(cause.getMessage(), cause);
+        this.code = code;
     }
 
-
     public int getCode() {
         return code;
     }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZmsClientImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZmsClientImpl.java
index beca72cc3ca..db42862f8e3 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZmsClientImpl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZmsClientImpl.java
@@ -179,7 +179,7 @@ public class ZmsClientImpl implements ZmsClient {
             wrappedCode.run();
         } catch (ZMSClientException e) {
             logWarning(e);
-            throw new ZmsException(e);
+            throw new ZmsException(e.getCode(), e);
         }
     }
 
@@ -188,7 +188,7 @@ public class ZmsClientImpl implements ZmsClient {
             return wrappedCode.get();
         } catch (ZMSClientException e) {
             logWarning(e);
-            throw new ZmsException(e);
+            throw new ZmsException(e.getCode(), e);
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZtsClientImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZtsClientImpl.java
index b141d728afd..4afd5c3ec73 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZtsClientImpl.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/ZtsClientImpl.java
@@ -44,7 +44,7 @@ public class ZtsClientImpl implements ZtsClient {
                     .map(AthenzDomain::new)
                     .collect(toList());
         } catch (ZTSClientException e) {
-            throw new ZtsException(e);
+            throw new ZtsException(e.getCode(), e);
         }
     }
 
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java
index 1f37edf5526..eb467ff5d99 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/mock/ZmsClientMock.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.athenz.mock;
 
-import com.yahoo.athenz.zms.ZMSClientException;
 import com.yahoo.vespa.hosted.controller.api.identifiers.ApplicationId;
 import com.yahoo.vespa.hosted.controller.api.identifiers.AthenzDomain;
 import com.yahoo.vespa.hosted.controller.athenz.ApplicationAction;
@@ -111,7 +110,7 @@ public class ZmsClientMock implements ZmsClient {
     }
 
     private static ZmsException zmsException(int code, String message, Object... args) {
-        return new ZmsException(new ZMSClientException(code, String.format(message, args)));
+        return new ZmsException(code, String.format(message, args));
     }
 
     private static void log(String format, Object... args) {