Merge pull request #62 from conductor-oss/application-client

Update application client

Author: ArturSelitskiy-sm

orkes-client/src/main/java/io/orkes/conductor/client/AuthorizationClient.java

@@ -96,4 +96,6 @@ public interface AuthorizationClient {
     List<TagObject> getApplicationTags(String applicationId);
 
     void deleteApplicationTags(List<TagObject> body, String applicationId);
+
+    ConductorApplication getApplicationByAccessKeyId(String accessKeyId);
 }

orkes-client/src/main/java/io/orkes/conductor/client/http/ApplicationResource.java

@@ -120,6 +120,18 @@ ConductorApplication getApplication(String applicationId) {
         return response.getData();
     }
 
+    ConductorApplication getApplicationByAccessKeyId(String accessKeyId) {
+        ConductorClientRequest request = ConductorClientRequest.builder()
+                .method(Method.GET)
+                .path("/applications/key/{accessKeyId}")
+                .addPathParam("accessKeyId", accessKeyId)
+                .build();
+        ConductorClientResponse<ConductorApplication> response = client.execute(request, new TypeReference<>() {
+        });
+
+        return response.getData();
+    }
+
     List<ConductorApplication> listApplications() {
         ConductorClientRequest request = ConductorClientRequest.builder()
                 .method(Method.GET)
@@ -156,10 +168,12 @@ AccessKeyResponse toggleAccessKeyStatus(String applicationId, String keyId) {
     }
 
     void putTags(List<TagObject> body, String applicationId) {
-        Objects.requireNonNull(body, "List<TagObject> cannot be null");
+        if (body == null) {
+            throw new IllegalArgumentException("tags must not be null");
+        }
         ConductorClientRequest request = ConductorClientRequest.builder()
                 .method(Method.PUT)
-                .path("/applications/{id}/tags")
+                .path("/applications/{applicationId}/tags")
                 .addPathParam("applicationId", applicationId)
                 .body(body)
                 .build();
@@ -170,7 +184,7 @@ void putTags(List<TagObject> body, String applicationId) {
     List<TagObject> getTags(String applicationId) {
         ConductorClientRequest request = ConductorClientRequest.builder()
                 .method(Method.GET)
-                .path("/applications/{id}/tags")
+                .path("/applications/{applicationId}/tags")
                 .addPathParam("applicationId", applicationId)
                 .build();
 
@@ -181,10 +195,12 @@ List<TagObject> getTags(String applicationId) {
     }
 
     void deleteTags(List<TagObject> body, String applicationId) {
-        Objects.requireNonNull(body, "List<TagObject> cannot be null");
+        if (body == null) {
+            throw new IllegalArgumentException("tags must not be null");
+        }
         ConductorClientRequest request = ConductorClientRequest.builder()
                 .method(Method.DELETE)
-                .path("/applications/{id}/tags")
+                .path("/applications/{applicationId}/tags")
                 .addPathParam("applicationId", applicationId)
                 .body(body)
                 .build();

orkes-client/src/main/java/io/orkes/conductor/client/http/OrkesAuthorizationClient.java

@@ -242,4 +242,9 @@ public List<TagObject> getApplicationTags(String applicationId) {
     public void deleteApplicationTags(List<TagObject> tags, String applicationId) {
         applicationResource.deleteTags(tags, applicationId);
     }
+
+    @Override
+    public ConductorApplication getApplicationByAccessKeyId(String accessKeyId) {
+        return applicationResource.getApplicationByAccessKeyId(accessKeyId);
+    }
 }

tests/src/test/java/io/orkes/conductor/client/http/AuthorizationClientTests.java

@@ -175,6 +175,18 @@ void testApplication() {
         authorizationClient.deleteApplication(application.getId());
     }
 
+    @Test
+    void testGetApplicationByAccessKeyId() {
+        CreateAccessKeyResponse accessKey = authorizationClient.createAccessKey(applicationId);
+        try {
+            ConductorApplication app = authorizationClient.getApplicationByAccessKeyId(accessKey.getId());
+            Assertions.assertNotNull(app);
+            Assertions.assertEquals(applicationId, app.getId());
+        } finally {
+            authorizationClient.deleteAccessKey(applicationId, accessKey.getId());
+        }
+    }
+
     @Test
     void testGrantPermissionsToGroup() {
         AuthorizationRequest request = new AuthorizationRequest();