Refactor entity parsing from getInstanceIdentity

1 files changed, 7 insertions, 4 deletions

diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
index e523df053d3..a2db9b9e24e 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/client/zts/DefaultZtsClient.java
@@ -111,12 +111,15 @@ public class DefaultZtsClient implements ZtsClient {
     }
 
     private static InstanceIdentity getInstanceIdentity(HttpResponse response) throws IOException {
-        if (HttpStatus.isSuccess(response.getStatusLine().getStatusCode())) {
-            InstanceIdentityCredentials entity =
-                    objectMapper.readValue(response.getEntity().getContent(), InstanceIdentityCredentials.class);
-            return entity.getServiceToken() != null
+        InstanceIdentityCredentials entity = readEntity(response, InstanceIdentityCredentials.class);
+        return entity.getServiceToken() != null
                     ? new InstanceIdentity(entity.getX509Certificate(), new NToken(entity.getServiceToken()))
                     : new InstanceIdentity(entity.getX509Certificate());
+    }
+
+    private static <T> T readEntity(HttpResponse response, Class<T> entityType) throws IOException {
+        if (HttpStatus.isSuccess(response.getStatusLine().getStatusCode())) {
+            return objectMapper.readValue(response.getEntity().getContent(), entityType);
         } else {
             String message = EntityUtils.toString(response.getEntity());
             throw new ZtsClientException(