SK-1684 Add Unit Tests

.github/workflows/pr.yml

@@ -1,6 +1,6 @@
 name: PR CI Checks
 
-on: [ pull_request ]
+on: [pull_request]
 
 jobs:
   check-commit-message:
@@ -11,18 +11,18 @@ jobs:
         uses: gsactions/commit-message-checker@v1
         with:
           pattern: '\[?[A-Z]{1,5}-[1-9][0-9]*.+$'
-          flags: 'gm'
-          excludeDescription: 'true'
-          checkAllCommitMessages: 'true'
+          flags: "gm"
+          excludeDescription: "true"
+          checkAllCommitMessages: "true"
           accessToken: ${{ secrets.PAT_ACTIONS }}
-          error: 'One of your your commit messages is not matching the format with JIRA ID Ex: ( SDK-123 commit message )'
+          error: "One of your your commit messages is not matching the format with JIRA ID Ex: ( SDK-123 commit message )"
   Test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
       - uses: actions/setup-java@v1
         with:
-          java-version: '1.8'
+          java-version: "1.8"
 
       - name: create-json
         id: create-json
@@ -31,6 +31,13 @@ jobs:
           name: "credentials.json"
           json: ${{ secrets.TEST_CREDENTIALS_FILE_STRING }}
 
+      - name: create env
+        id: create-env
+        run: |
+          touch .env
+          echo SKYFLOW_CREDENTIALS=${{ secrets.SKYFLOW_CREDENTIALS }} >> .env
+          echo TEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} >> .env
+
       - name: Build & Run tests with Maven
         run: mvn -B package -DTEST_EXPIRED_TOKEN=${{ secrets.TEST_EXPIRED_TOKEN }} -DTEST_DATA_CREDENTIALS_FILE=${{ secrets.TEST_DATA_CREDENTIALS_FILE }} -f pom.xml
 

pom.xml

@@ -7,7 +7,7 @@
     <groupId>com.skyflow</groupId>
     <artifactId>skyflow-java</artifactId>
     <version>1.15.0</version>
-    <packaging>pom</packaging>
+    <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Skyflow SDK for the Java programming language</description>
@@ -25,10 +25,6 @@
             <name>skyflow</name>
         </developer>
     </developers>
-    <modules>
-        <module>v1</module>
-        <module>v2</module>
-    </modules>
     <scm>
         <connection>scm:git:git://github.com:skyflowapi/skyflow-java.git</connection>
         <developerConnection>scm:git:ssh://github.com:skyflowapi/skyflow-java.git</developerConnection>
@@ -41,6 +37,11 @@
         <okhttp-version>4.12.0</okhttp-version>
         <gson-version>2.10.1</gson-version>
         <gson-fire-version>1.9.0</gson-fire-version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <okhttp-version>4.12.0</okhttp-version>
+        <junit-version>4.13.2</junit-version>
+        <javax-xml-bind-version>2.3.1</javax-xml-bind-version>
+        <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
     </properties>
 
     <distributionManagement>
@@ -55,47 +56,64 @@
     </distributionManagement>
 
     <dependencies>
+        <!-- newly added v2 dependencies -->
         <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.13.0</version>
+            <groupId>io.github.cdimascio</groupId>
+            <artifactId>dotenv-java</artifactId>
+            <version>2.2.0</version>
         </dependency>
         <dependency>
-            <groupId>com.googlecode.json-simple</groupId>
-            <artifactId>json-simple</artifactId>
-            <version>1.1.1</version>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
         </dependency>
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt</artifactId>
-            <version>0.9.1</version>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>${gson-fire-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson-version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <!-- existing dependencies -->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
             <version>1.15</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.9.1</version>
         </dependency>
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-impl</artifactId>
-            <version>0.11.2</version>
-            <scope>runtime</scope>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>io.jsonwebtoken</groupId>
-            <artifactId>jjwt-jackson</artifactId>
-            <version>0.11.2</version>
-            <scope>runtime</scope>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>${javax-xml-bind-version}</version>
         </dependency>
+        <!-- existing test dependencies -->
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.13.2</version>
+            <version>${junit-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -142,6 +160,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <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
+                    </excludePackageNames>
+                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>

src/main/java/com/skyflow/ConnectionClient.java

@@ -0,0 +1,86 @@
+package com.skyflow;
+
+import com.skyflow.config.ConnectionConfig;
+import com.skyflow.config.Credentials;
+import com.skyflow.errors.ErrorCode;
+import com.skyflow.errors.ErrorMessage;
+import com.skyflow.errors.SkyflowException;
+import com.skyflow.logs.InfoLogs;
+import com.skyflow.serviceaccount.util.Token;
+import com.skyflow.utils.Constants;
+import com.skyflow.utils.Utils;
+import com.skyflow.utils.logger.LogUtil;
+import com.skyflow.utils.validations.Validations;
+import io.github.cdimascio.dotenv.Dotenv;
+
+public class ConnectionClient {
+    private final ConnectionConfig connectionConfig;
+    protected String token;
+    protected String apiKey;
+    private Credentials commonCredentials;
+    private Credentials finalCredentials;
+
+    protected ConnectionClient(ConnectionConfig connectionConfig, Credentials credentials) {
+        super();
+        this.connectionConfig = connectionConfig;
+        this.commonCredentials = credentials;
+    }
+
+    protected ConnectionConfig getConnectionConfig() {
+        return connectionConfig;
+    }
+
+    protected void setCommonCredentials(Credentials commonCredentials) {
+        this.commonCredentials = commonCredentials;
+        prioritiseCredentials();
+    }
+
+    protected void updateConnectionConfig(ConnectionConfig connectionConfig) {
+        prioritiseCredentials();
+    }
+
+    protected void setBearerToken() throws SkyflowException {
+        prioritiseCredentials();
+        Validations.validateCredentials(this.finalCredentials);
+        if (this.finalCredentials.getApiKey() != null) {
+            setApiKey();
+            return;
+        } else if (Token.isExpired(token)) {
+            LogUtil.printInfoLog(InfoLogs.BEARER_TOKEN_EXPIRED.getLog());
+            token = Utils.generateBearerToken(this.finalCredentials);
+        } else {
+            LogUtil.printInfoLog(InfoLogs.REUSE_BEARER_TOKEN.getLog());
+        }
+    }
+
+    private void setApiKey() {
+        if (apiKey == null) {
+            apiKey = this.finalCredentials.getApiKey();
+        } else {
+            LogUtil.printInfoLog(InfoLogs.REUSE_API_KEY.getLog());
+        }
+    }
+
+    private void prioritiseCredentials() {
+        try {
+            if (this.connectionConfig.getCredentials() != null) {
+                this.finalCredentials = this.connectionConfig.getCredentials();
+            } else if (this.commonCredentials != null) {
+                this.finalCredentials = this.commonCredentials;
+            } else {
+                Dotenv dotenv = Dotenv.load();
+                String sysCredentials = dotenv.get(Constants.ENV_CREDENTIALS_KEY_NAME);
+                if (sysCredentials == null) {
+                    throw new SkyflowException(ErrorCode.INVALID_INPUT.getCode(),
+                            ErrorMessage.EmptyCredentials.getMessage());
+                } else {
+                    this.finalCredentials = new Credentials();
+                    this.finalCredentials.setCredentialsString(sysCredentials);
+                }
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}