From cf7480d22b9fce09d190f33d9a7231cfc07621d1 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Mon, 26 Aug 2024 13:23:22 +0530
Subject: [PATCH 1/3] Early acess header testcases added

---
 pom.xml                                       | 15 ++++-
 .../cms/ContentstackUnitTest.java             | 67 +++++++++++++++++++
 2 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb50d2f0..942b87c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <rxjava-source.version>3.1.8</rxjava-source.version>
         <retrofit-source.version>2.10.0</retrofit-source.version>
         <converter-gson-version>2.10.0</converter-gson-version>
-        <logging.version>5.0.0-alpha.12</logging.version>
+        <okhttp.version>4.11.0</okhttp.version>
         <jococo-plugin.version>0.8.7</jococo-plugin.version>
         <lombok-source.version>1.18.32</lombok-source.version>
         <junit-jupiter.version>5.10.1</junit-jupiter.version>
@@ -132,9 +132,20 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>logging-interceptor</artifactId>
-            <version>${logging.version}</version>
+            <version>${okhttp.version}</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>${okhttp.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
diff --git a/src/test/java/com/contentstack/cms/ContentstackUnitTest.java b/src/test/java/com/contentstack/cms/ContentstackUnitTest.java
index eaca866e..6386cf22 100644
--- a/src/test/java/com/contentstack/cms/ContentstackUnitTest.java
+++ b/src/test/java/com/contentstack/cms/ContentstackUnitTest.java
@@ -1,9 +1,15 @@
 package com.contentstack.cms;
 
+import com.contentstack.cms.core.AuthInterceptor;
 import com.contentstack.cms.organization.Organization;
 import com.contentstack.cms.stack.Stack;
 import okhttp3.Headers;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
 import okhttp3.ResponseBody;
+import okhttp3.mockwebserver.MockResponse;
+import okhttp3.mockwebserver.MockWebServer;
+import okhttp3.mockwebserver.RecordedRequest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import retrofit2.Response;
@@ -262,5 +268,66 @@ public void testEmptyOrganizationUid() {
         Assertions.assertThrows(IllegalStateException.class, () -> client.organization(emptyOrganizationUid));
     }
 
+    @Test
+    public void testEarlyAccessHeader() throws IOException, InterruptedException {
+        MockWebServer mockWebServer = new MockWebServer();
+        mockWebServer.enqueue(new MockResponse().setBody("{}"));
+
+        AuthInterceptor authInterceptor = new AuthInterceptor();
+        authInterceptor.setEarlyAccess(new String[]{"Taxonomy"});
+
+        OkHttpClient client = new OkHttpClient.Builder()
+                .addInterceptor(authInterceptor)
+                .build();
+
+        Request request = new Request.Builder()
+                .url(mockWebServer.url("/"))
+                .build();
+
+        client.newCall(request).execute();
+        RecordedRequest recordedRequest = mockWebServer.takeRequest();
+        String earlyAccessHeader = recordedRequest.getHeader("x-header-ea");
+
+        Assertions.assertNotNull(earlyAccessHeader);
+        Assertions.assertEquals("Taxonomy", earlyAccessHeader);
+
+        mockWebServer.shutdown();
+    } 
+    @Test
+    public void testEarlyAccessMultipleHeader() throws IOException, InterruptedException {
+        MockWebServer mockWebServer = new MockWebServer();
+        mockWebServer.enqueue(new MockResponse().setBody("{}"));
+
+        AuthInterceptor authInterceptor = new AuthInterceptor();
+        authInterceptor.setEarlyAccess(new String[]{"Taxonomy","Teams"});
+
+        OkHttpClient client = new OkHttpClient.Builder()
+                .addInterceptor(authInterceptor)
+                .build();
+
+        Request request = new Request.Builder()
+                .url(mockWebServer.url("/"))
+                .build();
+
+        client.newCall(request).execute();
+        RecordedRequest recordedRequest = mockWebServer.takeRequest();
+        String earlyAccessHeader = recordedRequest.getHeader("x-header-ea");
+
+        Assertions.assertNotNull(earlyAccessHeader);
+        Assertions.assertEquals("Taxonomy, Teams", earlyAccessHeader);
+
+        mockWebServer.shutdown();
+    }               
+
+    @Test
+    public void testEarlyAccessHeaderEmpty() {
+        String[] emptyEarlyAccessFeatures = {};
+        Contentstack client = new Contentstack.Builder()
+                .earlyAccess(emptyEarlyAccessFeatures)
+                .build();
+        
+        Assertions.assertNotNull(client.earlyAccess);
+        Assertions.assertEquals(0, client.earlyAccess.length);
+    }
 
 }

From 0ac48bbd52e9cc9b3c6ece670cdfab1765707f46 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Mon, 26 Aug 2024 13:27:12 +0530
Subject: [PATCH 2/3] chore: version bump

---
 changelog.md | 6 ++++++
 pom.xml      | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 940c5d48..6b536a67 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.4.4
+
+### Sept 04, 2024
+
+- Early access header tests
+
 ## v1.4.3
 
 ### July 08, 2024
diff --git a/pom.xml b/pom.xml
index 942b87c0..40038023 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <artifactId>cms</artifactId>
     <packaging>jar</packaging>
     <name>contentstack-management-java</name>
-    <version>1.4.3</version>
+    <version>1.4.4</version>
     <description>Contentstack Java Management SDK for Content Management API, Contentstack is a headless CMS with an
         API-first approach
     </description>

From 23795bb749da2413a495eaf75bd2a75e523ac547 Mon Sep 17 00:00:00 2001
From: reeshika-h <reeshika.hosmani@contentstack.com>
Date: Mon, 26 Aug 2024 13:37:01 +0530
Subject: [PATCH 3/3] chore: upgraded packages

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 40038023..fc1aae58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,11 +91,11 @@
         <rxjava-source.version>3.1.8</rxjava-source.version>
         <retrofit-source.version>2.10.0</retrofit-source.version>
         <converter-gson-version>2.10.0</converter-gson-version>
-        <okhttp.version>4.11.0</okhttp.version>
+        <okhttp.version>4.12.0</okhttp.version>
         <jococo-plugin.version>0.8.7</jococo-plugin.version>
         <lombok-source.version>1.18.32</lombok-source.version>
         <junit-jupiter.version>5.10.1</junit-jupiter.version>
-        <junit-jupiter-engine.version>5.8.0-M1</junit-jupiter-engine.version>
+        <junit-jupiter-engine.version>5.10.1</junit-jupiter-engine.version>
         <gson.version>2.10.1</gson.version>
         <maven-site-plugin.version>3.3</maven-site-plugin.version>
         <maven-gpg-plugin.version>1.5</maven-gpg-plugin.version>