Merge pull request #72 from conductor-oss/sdk_consolidation

SDK Consolidation across Orkes and oss clients

Author: v1r3n

.gitignore

@@ -3,4 +3,5 @@ build/
 .DS_Store
 .idea/
 .vscode/
-**/out/
+**/out/
+bin/

conductor-client-spring/build.gradle

@@ -19,8 +19,6 @@ repositories {
 
 dependencies {
     api project(":conductor-client")
-    api project(":java-sdk")
-
     implementation 'org.springframework.boot:spring-boot-starter:3.3.0'
 }
 

…client/spring/OrkesClientProperties.java …client/spring/OrkesClientProperties.javaorkes-spring/src/main/java/io/orkes/conductor/client/spring/OrkesClientProperties.java renamed to conductor-client-spring/src/main/java/io/orkes/conductor/client/spring/OrkesClientProperties.java orkes-spring/src/main/java/io/orkes/conductor/client/spring/OrkesClientProperties.java renamed to conductor-client-spring/src/main/java/io/orkes/conductor/client/spring/OrkesClientProperties.java

@@ -1,2 +1,3 @@
 com.netflix.conductor.client.spring.ConductorClientAutoConfiguration
 com.netflix.conductor.client.spring.ConductorWorkerAutoConfiguration
+io.orkes.conductor.client.spring.OrkesConductorClientAutoConfiguration

…kesConductorClientAutoConfiguration.java …kesConductorClientAutoConfiguration.javaorkes-spring/src/main/java/io/orkes/conductor/client/spring/OrkesConductorClientAutoConfiguration.java renamed to conductor-client-spring/src/main/java/io/orkes/conductor/client/spring/OrkesConductorClientAutoConfiguration.java orkes-spring/src/main/java/io/orkes/conductor/client/spring/OrkesConductorClientAutoConfiguration.java renamed to conductor-client-spring/src/main/java/io/orkes/conductor/client/spring/OrkesConductorClientAutoConfiguration.java

@@ -22,7 +22,7 @@ dependencies {
     testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${versions.junit}"
 
     testImplementation 'org.mockito:mockito-inline:5.2.0'
-
+    testImplementation 'org.mockito:mockito-core:5.4.0'
     testImplementation 'org.spockframework:spock-core:2.3-groovy-3.0'
     testImplementation 'org.codehaus.groovy:groovy:3.0.25'
     testImplementation 'ch.qos.logback:logback-classic:1.5.6'

conductor-client-spring/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 Conductor Authors.
+ * Copyright 2026 Conductor Authors.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
@@ -15,129 +15,35 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
+import io.orkes.conductor.client.http.ApiException;
 
-import com.netflix.conductor.common.validation.ValidationError;
-
-import lombok.Data;
-import lombok.Setter;
-
-@Data
-public class ConductorClientException extends RuntimeException {
-    static boolean initPreferErrOverResponse() {
-        try {
-            final String propName = "conductor.client.exception.preferErrOverResponse";
-            return Boolean.getBoolean(propName);
-        } catch (SecurityException e) {
-            return false;
-        }
-    }
-
-    private final static boolean PREFER_ERR_OVER_RESPONSE = initPreferErrOverResponse();
-
-    private int status;
-    private String instance;
-    private String code;
-    @Setter
-    private boolean retryable;
-    private List<ValidationError> validationErrors; //List of validation errors. Available when the status code is 400
-    private Map<String, List<String>> responseHeaders;
-    private String responseBody;
+public class ConductorClientException extends ApiException {
 
     public ConductorClientException(String message) {
         super(message);
-        this.responseBody = message;
     }
 
-    public ConductorClientException(int statusCode, String message) {
-        super(message);
-        this.status = statusCode;
-        this.responseBody = message;
-    }
-
-    public ConductorClientException(Throwable t) {
-        super(t.getMessage(), t);
-        this.responseBody = t.getMessage();
+    public ConductorClientException(String message, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, code, responseHeaders, responseBody);
     }
 
     public ConductorClientException(String message, Throwable t) {
         super(message, t);
-        this.responseBody = message;
-    }
-
-    public ConductorClientException(String message,
-        int code,
-        Map<String, List<String>> responseHeaders,
-        String responseBody) {
-        this(message, null, code, responseHeaders, responseBody);
-    }
-
-    public ConductorClientException(String message,
-        Throwable t,
-        int code,
-        Map<String, List<String>> responseHeaders) {
-        this(message, t, code, responseHeaders, message);
-    }
-
-    public ConductorClientException(String message,
-                                    Throwable t,
-                                    int code,
-                                    Map<String, List<String>> responseHeaders,
-                                    String responseBody) {
-        super(message, t);
-        this.code = String.valueOf(code);
-        this.status = code;
-        this.responseHeaders = responseHeaders;
-        this.responseBody = responseBody;
     }
 
-    public boolean isClientError() {
-        return getStatus() > 399 && getStatus() < 499;
+    public ConductorClientException(String message, Throwable t, int code, Map<String, List<String>> responseHeaders) {
+        super(message, t, code, responseHeaders);
     }
 
-    /**
-     * @return HTTP status code
-     */
-    public int getStatusCode() {
-        return getStatus();
+    public ConductorClientException(String message, Throwable t, int code, Map<String, List<String>> responseHeaders, String responseBody) {
+        super(message, t, code, responseHeaders, responseBody);
     }
 
-    @Override
-    public String getMessage() {
-        if (PREFER_ERR_OVER_RESPONSE) {
-            return StringUtils.isNotBlank(super.getMessage()) ? super.getMessage() : responseBody;
-        }
-        return StringUtils.isNotBlank(responseBody) ? responseBody : super.getMessage();
+    public ConductorClientException(int statusCode, String message) {
+        super(statusCode, message);
     }
 
-    @Override
-    public String toString() {
-        StringBuilder builder = new StringBuilder();
-        builder.append(getClass().getName()).append(": ");
-
-        if (getMessage() != null) {
-            builder.append(getMessage());
-        }
-
-        if (status > 0) {
-            builder.append(" {status=").append(status);
-            if (this.code != null) {
-                builder.append(", code='").append(code).append("'");
-            }
-
-            builder.append(", retryable: ").append(retryable);
-        }
-
-        if (this.instance != null) {
-            builder.append(", instance: ").append(instance);
-        }
-
-        if (this.validationErrors != null) {
-            builder.append(", validationErrors: ").append(validationErrors);
-        }
-
-        builder.append("}");
-        return builder.toString();
+    public ConductorClientException(Throwable t) {
+        super(t);
     }
-
 }