SK-2141: Beta Release Fern Integration and Detect Support

.github/workflows/internal-release.yml

@@ -4,7 +4,6 @@ on:
     tags-ignore:
       - '*.*'
     paths-ignore:
-      - "pom.xml"
       - "*.md"
     branches:
       - release/*

.github/workflows/pr.yml

@@ -40,7 +40,7 @@ jobs:
           echo TEST_REUSABLE_TOKEN=${{ secrets.TEST_REUSABLE_TOKEN }} >> .env
 
       - name: Build & Run tests with Maven
-        run: mvn -B package -f pom.xml
+        run: mvn -B package -f pom.xml -Dmaven.javadoc.skip=true
 
       - name: Codecov
         uses: codecov/codecov-action@v2.1.0

.github/workflows/shared-build-and-deploy.yml

@@ -126,6 +126,7 @@ jobs:
 
       - name: Publish package
         run: mvn --batch-mode deploy -P ${{ inputs.profile }}
+
         env:
           SERVER_USERNAME: ${{ secrets.server-username }}
           SERVER_PASSWORD: ${{ secrets.server-password  }}

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.skyflow</groupId>
     <artifactId>skyflow-java</artifactId>
-    <version>2.0.0-beta.1-dev.ec349a9</version>
+    <version>2.0.0-beta.1-dev.e14bd74</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -45,6 +45,30 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.12.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.17.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jdk8</artifactId>
+            <version>2.17.2</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.17.2</version>
+            <scope>compile</scope>
+        </dependency>
         <!-- newly added v2 dependencies -->
         <dependency>
             <groupId>io.github.cdimascio</groupId>
@@ -117,6 +141,12 @@
             <version>2.0.9</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.13.2</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -140,10 +170,7 @@
                 <version>3.2.0</version>
                 <configuration>
                     <excludePackageNames>
-                        :com.skyflow.generated.rest
-                        :com.skyflow.generated.rest.api
-                        :com.skyflow.generated.rest.auth
-                        :com.skyflow.generated.rest.models
+                        com.skyflow.generated.rest.*
                     </excludePackageNames>
                 </configuration>
                 <executions>
@@ -276,5 +303,4 @@
             </distributionManagement>
         </profile>
     </profiles>
-
 </project>

src/main/java/com/skyflow/Skyflow.java

@@ -14,6 +14,7 @@
 import com.skyflow.utils.logger.LogUtil;
 import com.skyflow.utils.validations.Validations;
 import com.skyflow.vault.controller.ConnectionController;
+import com.skyflow.vault.controller.DetectController;
 import com.skyflow.vault.controller.VaultController;
 
 import java.util.LinkedHashMap;
@@ -101,25 +102,57 @@
         return controller;
     }
 
-    public ConnectionController connection() {
-        String connectionId = (String) this.builder.connectionsMap.keySet().toArray()[0];
+
+    public ConnectionController connection() throws SkyflowException {
+        Object[] array = this.builder.connectionsMap.keySet().toArray();
+        if (array.length < 1) {
+            LogUtil.printErrorLog(ErrorLogs.CONNECTION_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.ConnectionIdNotInConfigList.getMessage());
+        }
+        String connectionId = (String) array[0];
         return this.connection(connectionId);
     }
 
-    public ConnectionController connection(String connectionId) {
-        return this.builder.connectionsMap.get(connectionId);
+    public ConnectionController connection(String connectionId) throws SkyflowException {
+        ConnectionController controller = this.builder.connectionsMap.get(connectionId);
+        if (controller == null) {
+            LogUtil.printErrorLog(ErrorLogs.CONNECTION_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.ConnectionIdNotInConfigList.getMessage());
+        }
+        return controller;
+    }
+
+    public DetectController detect() throws SkyflowException {
+        Object[] array = this.builder.detectClientsMap.keySet().toArray();
+        if (array.length < 1) {
+            LogUtil.printErrorLog(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage());
+        }
+        String detectId = (String) array[0];
+        return this.detect(detectId);
+    }
+
+    public DetectController detect(String vaultId) throws SkyflowException {
+        DetectController controller = this.builder.detectClientsMap.get(vaultId);
+        if (controller == null) {
+            LogUtil.printErrorLog(ErrorLogs.VAULT_CONFIG_DOES_NOT_EXIST.getLog());
+            throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(), ErrorMessage.VaultIdNotInConfigList.getMessage());
+        }
+        return controller;
     }
 
     public static final class SkyflowClientBuilder {
         private final LinkedHashMap<String, ConnectionController> connectionsMap;
         private final LinkedHashMap<String, VaultController> vaultClientsMap;
+        private final LinkedHashMap<String, DetectController> detectClientsMap;
         private final LinkedHashMap<String, VaultConfig> vaultConfigMap;
         private final LinkedHashMap<String, ConnectionConfig> connectionConfigMap;
         private Credentials skyflowCredentials;
         private LogLevel logLevel;
 
         public SkyflowClientBuilder() {
             this.vaultClientsMap = new LinkedHashMap<>();
+            this.detectClientsMap = new LinkedHashMap<>();
             this.vaultConfigMap = new LinkedHashMap<>();
             this.connectionsMap = new LinkedHashMap<>();
             this.connectionConfigMap = new LinkedHashMap<>();
@@ -139,8 +172,11 @@
             } else {
                 this.vaultConfigMap.put(vaultConfig.getVaultId(), vaultConfig);
                 this.vaultClientsMap.put(vaultConfig.getVaultId(), new VaultController(vaultConfig, this.skyflowCredentials));
+                this.detectClientsMap.put(vaultConfig.getVaultId(), new DetectController(vaultConfig, this.skyflowCredentials));
                 LogUtil.printInfoLog(Utils.parameterizedString(
                         InfoLogs.VAULT_CONTROLLER_INITIALIZED.getLog(), vaultConfig.getVaultId()));
+                LogUtil.printInfoLog(Utils.parameterizedString(
+                        InfoLogs.DETECT_CONTROLLER_INITIALIZED.getLog(), vaultConfig.getVaultId()));
             }
             return this;
         }
@@ -226,6 +262,9 @@
             for (VaultController vault : this.vaultClientsMap.values()) {
                 vault.setCommonCredentials(this.skyflowCredentials);
             }
+            for (DetectController detect : this.detectClientsMap.values()) {
+                detect.setCommonCredentials(this.skyflowCredentials);
+            }
             for (ConnectionController connection : this.connectionsMap.values()) {
                 connection.setCommonCredentials(this.skyflowCredentials);
             }