Merge pull request #17 from orkes-io/models_not_in_http

refactor the model outside of http
orkes-io · Sep 13, 2022 · f9c8bf8 · f9c8bf8
2 parents 08d8b7c + f3a1db9
commit f9c8bf8
Show file tree

Hide file tree

Showing 61 changed files with 136 additions and 108 deletions.
diff --git a/src/main/java/io/orkes/conductor/client/ApiClient.java b/src/main/java/io/orkes/conductor/client/ApiClient.java
@@ -49,7 +49,7 @@
 import io.orkes.conductor.client.http.auth.Authentication;
 import io.orkes.conductor.client.http.auth.HttpBasicAuth;
 import io.orkes.conductor.client.http.auth.OAuth;
-import io.orkes.conductor.client.http.model.GenerateTokenRequest;
+import io.orkes.conductor.client.model.GenerateTokenRequest;
 
 import com.squareup.okhttp.*;
 import com.squareup.okhttp.internal.http.HttpMethod;

diff --git a/src/main/java/io/orkes/conductor/client/AuthorizationClient.java b/src/main/java/io/orkes/conductor/client/AuthorizationClient.java
@@ -15,7 +15,7 @@
 import java.util.List;
 import java.util.Map;
 
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.*;
 
 public interface AuthorizationClient {
 

diff --git a/src/main/java/io/orkes/conductor/client/OrkesClients.java b/src/main/java/io/orkes/conductor/client/OrkesClients.java
@@ -13,11 +13,13 @@
 package io.orkes.conductor.client;
 
 import com.netflix.conductor.client.config.DefaultConductorClientConfiguration;
-import com.sun.jersey.api.client.config.ClientConfig;
-import com.sun.jersey.api.client.config.DefaultClientConfig;
+
 import io.orkes.conductor.client.http.*;
 import io.orkes.conductor.client.http.auth.AuthorizationClientFilter;
 
+import com.sun.jersey.api.client.config.ClientConfig;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+
 public class OrkesClients {
 
     private final ApiClient apiClient;
@@ -57,17 +59,22 @@ public TaskClient getTaskClient() {
     public com.netflix.conductor.client.http.WorkflowClient getWorkflowClientLegacy() {
         return getWorkflowClientLegacy(10);
     }
-    public com.netflix.conductor.client.http.WorkflowClient getWorkflowClientLegacy(int threadPoolSize) {
-        AuthorizationClientFilter authorizationClientFilter = new AuthorizationClientFilter(apiClient);
-        com.netflix.conductor.client.http.WorkflowClient workflowClient
-                = new com.netflix.conductor.client.http.WorkflowClient(
-                        conductorClientConfig(apiClient.getReadTimeout(), apiClient.getConnectTimeout(), threadPoolSize),
+
+    public com.netflix.conductor.client.http.WorkflowClient getWorkflowClientLegacy(
+            int threadPoolSize) {
+        AuthorizationClientFilter authorizationClientFilter =
+                new AuthorizationClientFilter(apiClient);
+        com.netflix.conductor.client.http.WorkflowClient workflowClient =
+                new com.netflix.conductor.client.http.WorkflowClient(
+                        conductorClientConfig(
+                                apiClient.getReadTimeout(),
+                                apiClient.getConnectTimeout(),
+                                threadPoolSize),
                         new DefaultConductorClientConfiguration(),
                         null,
-                        authorizationClientFilter
-        );
+                        authorizationClientFilter);
         String basePath = apiClient.getBasePath();
-        if(!basePath.endsWith("/")){
+        if (!basePath.endsWith("/")) {
             basePath = basePath + "/";
         }
         workflowClient.setRootURI(basePath);
@@ -80,39 +87,33 @@ public com.netflix.conductor.client.http.TaskClient getTaskClientLegacy() {
     }
 
     public com.netflix.conductor.client.http.TaskClient getTaskClientLegacy(int threadPoolSize) {
-        AuthorizationClientFilter authorizationClientFilter = new AuthorizationClientFilter(apiClient);
-        com.netflix.conductor.client.http.TaskClient taskClient
-                = new com.netflix.conductor.client.http.TaskClient(
-                conductorClientConfig(apiClient.getReadTimeout(), apiClient.getConnectTimeout(), threadPoolSize),
-                new DefaultConductorClientConfiguration(),
-                null,
-                authorizationClientFilter
-        );
+        AuthorizationClientFilter authorizationClientFilter =
+                new AuthorizationClientFilter(apiClient);
+        com.netflix.conductor.client.http.TaskClient taskClient =
+                new com.netflix.conductor.client.http.TaskClient(
+                        conductorClientConfig(
+                                apiClient.getReadTimeout(),
+                                apiClient.getConnectTimeout(),
+                                threadPoolSize),
+                        new DefaultConductorClientConfiguration(),
+                        null,
+                        authorizationClientFilter);
         String basePath = apiClient.getBasePath();
-        if(!basePath.endsWith("/")){
+        if (!basePath.endsWith("/")) {
             basePath = basePath + "/";
         }
         taskClient.setRootURI(basePath);
 
         return taskClient;
     }
 
-
-    private ClientConfig conductorClientConfig(int readTimeout, int connectionTimeout, int threadPoolSize) {
+    private ClientConfig conductorClientConfig(
+            int readTimeout, int connectionTimeout, int threadPoolSize) {
         var clientConfig = new DefaultClientConfig();
         var clientConfigProps = clientConfig.getProperties();
-        clientConfigProps.put(
-                ClientConfig.PROPERTY_CONNECT_TIMEOUT,
-                connectionTimeout
-        );
-        clientConfigProps.put(
-                ClientConfig.PROPERTY_READ_TIMEOUT,
-                readTimeout
-        );
-        clientConfigProps.put(
-                ClientConfig.PROPERTY_THREADPOOL_SIZE,
-                threadPoolSize
-        );
+        clientConfigProps.put(ClientConfig.PROPERTY_CONNECT_TIMEOUT, connectionTimeout);
+        clientConfigProps.put(ClientConfig.PROPERTY_READ_TIMEOUT, readTimeout);
+        clientConfigProps.put(ClientConfig.PROPERTY_THREADPOOL_SIZE, threadPoolSize);
         return clientConfig;
     }
 }
diff --git a/src/main/java/io/orkes/conductor/client/SchedulerClient.java b/src/main/java/io/orkes/conductor/client/SchedulerClient.java
@@ -14,9 +14,9 @@
 
 import java.util.List;
 
-import io.orkes.conductor.client.http.model.SaveScheduleRequest;
-import io.orkes.conductor.client.http.model.SearchResultWorkflowScheduleExecutionModel;
-import io.orkes.conductor.client.http.model.WorkflowSchedule;
+import io.orkes.conductor.client.model.SaveScheduleRequest;
+import io.orkes.conductor.client.model.SearchResultWorkflowScheduleExecutionModel;
+import io.orkes.conductor.client.model.WorkflowSchedule;
 
 public interface SchedulerClient {
     void deleteSchedule(String name);

diff --git a/src/main/java/io/orkes/conductor/client/WorkflowClient.java b/src/main/java/io/orkes/conductor/client/WorkflowClient.java
@@ -22,7 +22,7 @@
 import com.netflix.conductor.common.run.WorkflowSummary;
 
 import io.orkes.conductor.client.http.ApiCallback;
-import io.orkes.conductor.client.http.model.WorkflowStatus;
+import io.orkes.conductor.client.model.WorkflowStatus;
 
 import com.squareup.okhttp.Call;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/OrkesAuthorizationClient.java b/src/main/java/io/orkes/conductor/client/http/OrkesAuthorizationClient.java
@@ -21,7 +21,7 @@
 import io.orkes.conductor.client.http.api.AuthorizationResourceApi;
 import io.orkes.conductor.client.http.api.GroupResourceApi;
 import io.orkes.conductor.client.http.api.UserResourceApi;
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.*;
 
 public class OrkesAuthorizationClient extends OrkesClient implements AuthorizationClient {
 

diff --git a/src/main/java/io/orkes/conductor/client/http/OrkesMetadataClient.java b/src/main/java/io/orkes/conductor/client/http/OrkesMetadataClient.java
@@ -21,8 +21,8 @@
 import io.orkes.conductor.client.MetadataClient;
 import io.orkes.conductor.client.http.api.MetadataResourceApi;
 import io.orkes.conductor.client.http.api.TagsApi;
-import io.orkes.conductor.client.http.model.TagObject;
-import io.orkes.conductor.client.http.model.TagString;
+import io.orkes.conductor.client.model.TagObject;
+import io.orkes.conductor.client.model.TagString;
 
 public class OrkesMetadataClient extends OrkesClient implements MetadataClient {
 

diff --git a/src/main/java/io/orkes/conductor/client/http/OrkesSchedulerClient.java b/src/main/java/io/orkes/conductor/client/http/OrkesSchedulerClient.java
@@ -17,9 +17,9 @@
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.SchedulerClient;
 import io.orkes.conductor.client.http.api.SchedulerResourceApi;
-import io.orkes.conductor.client.http.model.SaveScheduleRequest;
-import io.orkes.conductor.client.http.model.SearchResultWorkflowScheduleExecutionModel;
-import io.orkes.conductor.client.http.model.WorkflowSchedule;
+import io.orkes.conductor.client.model.SaveScheduleRequest;
+import io.orkes.conductor.client.model.SearchResultWorkflowScheduleExecutionModel;
+import io.orkes.conductor.client.model.WorkflowSchedule;
 
 public class OrkesSchedulerClient extends OrkesClient implements SchedulerClient {
 

diff --git a/src/main/java/io/orkes/conductor/client/http/OrkesWorkflowClient.java b/src/main/java/io/orkes/conductor/client/http/OrkesWorkflowClient.java
@@ -28,7 +28,7 @@
 import io.orkes.conductor.client.WorkflowClient;
 import io.orkes.conductor.client.http.api.WorkflowBulkResourceApi;
 import io.orkes.conductor.client.http.api.WorkflowResourceApi;
-import io.orkes.conductor.client.http.model.WorkflowStatus;
+import io.orkes.conductor.client.model.WorkflowStatus;
 
 import com.google.common.base.Preconditions;
 import com.squareup.okhttp.Call;

diff --git a/src/main/java/io/orkes/conductor/client/http/api/ApplicationResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/ApplicationResourceApi.java
@@ -21,7 +21,7 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.*;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/AuthorizationResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/AuthorizationResourceApi.java
@@ -21,8 +21,9 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.*;
-import io.orkes.conductor.client.http.model.Subject;
+import io.orkes.conductor.client.http.Configuration;
+import io.orkes.conductor.client.model.AuthorizationRequest;
+import io.orkes.conductor.client.model.Subject;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/GroupResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/GroupResourceApi.java
@@ -21,7 +21,10 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.ConductorUser;
+import io.orkes.conductor.client.model.GrantedAccessResponse;
+import io.orkes.conductor.client.model.Group;
+import io.orkes.conductor.client.model.UpsertGroupRequest;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/SchedulerResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/SchedulerResourceApi.java
@@ -21,7 +21,9 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.SaveScheduleRequest;
+import io.orkes.conductor.client.model.SearchResultWorkflowScheduleExecutionModel;
+import io.orkes.conductor.client.model.WorkflowSchedule;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/TagsApi.java b/src/main/java/io/orkes/conductor/client/http/api/TagsApi.java
@@ -21,8 +21,8 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.TagObject;
-import io.orkes.conductor.client.http.model.TagString;
+import io.orkes.conductor.client.model.TagObject;
+import io.orkes.conductor.client.model.TagString;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/TaskResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/TaskResourceApi.java
@@ -26,9 +26,9 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.ExternalStorageLocation;
-import io.orkes.conductor.client.http.model.SearchResultTask;
-import io.orkes.conductor.client.http.model.SearchResultTaskSummary;
+import io.orkes.conductor.client.model.ExternalStorageLocation;
+import io.orkes.conductor.client.model.SearchResultTask;
+import io.orkes.conductor.client.model.SearchResultTaskSummary;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/TokenResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/TokenResourceApi.java
@@ -21,7 +21,7 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.GenerateTokenRequest;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/UserResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/UserResourceApi.java
@@ -21,7 +21,10 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.ConductorUser;
+import io.orkes.conductor.client.model.GrantedAccessResponse;
+import io.orkes.conductor.client.model.Response;
+import io.orkes.conductor.client.model.UpsertUserRequest;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/src/main/java/io/orkes/conductor/client/http/api/WorkflowResourceApi.java b/src/main/java/io/orkes/conductor/client/http/api/WorkflowResourceApi.java
@@ -26,7 +26,7 @@
 
 import io.orkes.conductor.client.ApiClient;
 import io.orkes.conductor.client.http.*;
-import io.orkes.conductor.client.http.model.*;
+import io.orkes.conductor.client.model.*;
 
 import com.google.gson.reflect.TypeToken;
 

diff --git a/.../client/http/model/AccessKeyResponse.java → ...uctor/client/model/AccessKeyResponse.java b/.../client/http/model/AccessKeyResponse.java → ...uctor/client/model/AccessKeyResponse.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 public class AccessKeyResponse {
     private String id;

diff --git a/...or/client/http/model/AccessKeyStatus.java → ...nductor/client/model/AccessKeyStatus.java b/...or/client/http/model/AccessKeyStatus.java → ...nductor/client/model/AccessKeyStatus.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 public enum AccessKeyStatus {
     ACTIVE,

diff --git a/...s/conductor/client/http/model/Action.java → .../orkes/conductor/client/model/Action.java b/...s/conductor/client/http/model/Action.java → .../orkes/conductor/client/model/Action.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.io.IOException;
 import java.util.Objects;

diff --git a/...ient/http/model/AuthorizationRequest.java → ...or/client/model/AuthorizationRequest.java b/...ient/http/model/AuthorizationRequest.java → ...or/client/model/AuthorizationRequest.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...ient/http/model/ConductorApplication.java → ...or/client/model/ConductorApplication.java b/...ient/http/model/ConductorApplication.java → ...or/client/model/ConductorApplication.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.util.Objects;
 

diff --git a/...ctor/client/http/model/ConductorUser.java → ...conductor/client/model/ConductorUser.java b/...ctor/client/http/model/ConductorUser.java → ...conductor/client/model/ConductorUser.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...t/http/model/CreateAccessKeyResponse.java → ...client/model/CreateAccessKeyResponse.java b/...t/http/model/CreateAccessKeyResponse.java → ...client/model/CreateAccessKeyResponse.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 public class CreateAccessKeyResponse {
     private String id;

diff --git a/...del/CreateOrUpdateApplicationRequest.java → ...del/CreateOrUpdateApplicationRequest.java b/...del/CreateOrUpdateApplicationRequest.java → ...del/CreateOrUpdateApplicationRequest.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.util.Objects;
 

diff --git a/...t/http/model/ExternalStorageLocation.java → ...client/model/ExternalStorageLocation.java b/...t/http/model/ExternalStorageLocation.java → ...client/model/ExternalStorageLocation.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.util.Objects;
 

diff --git a/...ient/http/model/GenerateTokenRequest.java → ...or/client/model/GenerateTokenRequest.java b/...ient/http/model/GenerateTokenRequest.java → ...or/client/model/GenerateTokenRequest.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.util.Objects;
 

diff --git a/...ctor/client/http/model/GrantedAccess.java → ...conductor/client/model/GrantedAccess.java b/...ctor/client/http/model/GrantedAccess.java → ...conductor/client/model/GrantedAccess.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.io.IOException;
 import java.util.ArrayList;

diff --git a/...ent/http/model/GrantedAccessResponse.java → ...r/client/model/GrantedAccessResponse.java b/...ent/http/model/GrantedAccessResponse.java → ...r/client/model/GrantedAccessResponse.java
@@ -10,7 +10,7 @@
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
  * specific language governing permissions and limitations under the License.
  */
-package io.orkes.conductor.client.http.model;
+package io.orkes.conductor.client.model;
 
 import java.util.ArrayList;
 import java.util.List;