Java 21

Author: oklemenz2

.github/workflows/deploy-java-cf.yml

@@ -28,7 +28,7 @@ jobs:
           cache: npm
       - uses: actions/setup-java@v5
         with:
-          distribution: sapmachine
+          distribution: temurin
           java-version: 21
           cache: maven
       - run: npm ci
@@ -48,7 +48,7 @@ jobs:
           BROKER_SERVICE_ID: ${{ secrets.BROKER_SERVICE_ID }}
           BROKER_SERVICE_PLAN_ID: ${{ secrets.BROKER_SERVICE_PLAN_ID }}
       - name: Unit Test
-        run: mvn test -B
+        run: npm test
         working-directory: ./afcjdk
       - name: Install CF actions
         run: npm i @actions/core && npm i @actions/exec && npm i @actions/tool-cache

.github/workflows/deploy-java-kyma.yml

@@ -29,7 +29,7 @@ jobs:
           cache: npm
       - uses: actions/setup-java@v5
         with:
-          distribution: sapmachine
+          distribution: temurin
           java-version: 21
           cache: maven
       - run: npm ci
@@ -54,7 +54,7 @@ jobs:
           BROKER_SERVICE_ID: ${{ secrets.BROKER_SERVICE_KYMA_ID }}
           BROKER_SERVICE_PLAN_ID: ${{ secrets.BROKER_SERVICE_KYMA_PLAN_ID }}
       - name: Unit Test
-        run: mvn test -B
+        run: npm test
         working-directory: ./afcjdk
       - name: Setup Kyma
         uses: ./.github/actions/kyma-setup

.github/workflows/main-ci.yml

@@ -92,5 +92,10 @@ jobs:
         with:
           node-version: 24
           cache: npm
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: maven
       - run: npm ci
       - run: npm run test:bin

.github/workflows/main-pr.yml

@@ -92,5 +92,10 @@ jobs:
         with:
           node-version: 24
           cache: npm
+      - uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 21
+          cache: maven
       - run: npm ci
       - run: npm run test:bin

java/project/srv/src/test/java/com/github/capjscommunity/sapafcsdk/scheduling/outbox/SchedulingProviderOutboxCancelTest.java

@@ -14,21 +14,27 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
 @AutoConfigureMockMvc
 @SpringBootTest
 public class SchedulingProviderOutboxCancelTest {
 
+  @DynamicPropertySource
+  static void overrideProps(DynamicPropertyRegistry registry) {
+    registry.add("cds.persistence.schema", () -> "OUTBOX_PROVIDER_CANCEL");
+  }
+
   @Autowired
   private MockMvc mockMvc;
 
@@ -67,7 +73,7 @@ public void cancelJobOutboxed() throws Exception {
       JSONObject json = new JSONObject(response);
       ID = json.getString("ID");
 
-      setup.awaitCompleted(5, TimeUnit.SECONDS);
+      setup.awaitCompleted();
 
       mockMvc
         .perform(get("/api/job-scheduling/v1/Job/" + ID))
@@ -84,14 +90,14 @@ public void cancelJobOutboxed() throws Exception {
         .andExpect(status().isOk())
         .andExpect(jsonPath("$.status").value("cancelRequested"));
 
-      List<JSONObject> messageEvents = setup.awaitCompleted(5, TimeUnit.SECONDS);
+      List<JSONObject> messageEvents = setup.awaitCompleted();
 
       mockMvc
         .perform(get("/api/job-scheduling/v1/Job/" + ID))
         .andExpect(status().isOk())
         .andExpect(jsonPath("$.status").value("canceled"));
 
-      JSONObject processingEvent = messageEvents.get(0);
+      JSONObject processingEvent = messageEvents.getFirst();
       assertEquals("sapafcsdk.scheduling.ProcessingService", processingEvent.get("event"));
       assertEquals("cancelJob", processingEvent.getJSONObject("message").get("event"));
       assertEquals(ID, processingEvent.getJSONObject("message").getJSONObject("params").get("ID"));

java/project/srv/src/test/java/com/github/capjscommunity/sapafcsdk/scheduling/outbox/SchedulingProviderOutboxCreateTest.java

@@ -13,21 +13,27 @@
 import com.sap.cds.services.runtime.CdsRuntime;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeUnit;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
 @AutoConfigureMockMvc
 @SpringBootTest
 public class SchedulingProviderOutboxCreateTest {
 
+  @DynamicPropertySource
+  static void overrideProps(DynamicPropertyRegistry registry) {
+    registry.add("cds.persistence.schema", () -> "OUTBOX_PROVIDER_CREATE");
+  }
+
   @Autowired
   private MockMvc mockMvc;
 
@@ -77,9 +83,9 @@ public void createJobOutboxed() throws Exception {
         .andExpect(status().isOk())
         .andExpect(jsonPath("$.status").value(JobStatusCode.REQUESTED));
 
-      List<JSONObject> messageEvents = setup.awaitCompleted(5, TimeUnit.SECONDS);
+      List<JSONObject> messageEvents = setup.awaitCompleted();
 
-      JSONObject processingEvent = messageEvents.get(0);
+      JSONObject processingEvent = messageEvents.getFirst();
       assertEquals("sapafcsdk.scheduling.ProcessingService", processingEvent.get("event"));
       assertEquals("processJob", processingEvent.getJSONObject("message").get("event"));
       assertEquals(ID, processingEvent.getJSONObject("message").getJSONObject("params").get("ID"));

java/project/srv/src/test/java/com/github/capjscommunity/sapafcsdk/scheduling/outbox/SchedulingWebsocketOutboxTest.java

@@ -13,19 +13,25 @@
 import com.sap.cds.services.persistence.PersistenceService;
 import com.sap.cds.services.runtime.CdsRuntime;
 import java.util.Collections;
-import java.util.concurrent.TimeUnit;
 import org.json.JSONObject;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
 
 @AutoConfigureMockMvc
 @SpringBootTest
 public class SchedulingWebsocketOutboxTest {
 
+  @DynamicPropertySource
+  static void overrideProps(DynamicPropertyRegistry registry) {
+    registry.add("cds.persistence.schema", () -> "OUTBOX_WEBSOCKET");
+  }
+
   @Autowired
   private CdsRuntime cdsRuntime;
 
@@ -51,7 +57,7 @@ public void jobStatusChanged() throws Exception {
       jobStatusChanged.setData(jobStatusChangedData);
       websocketServiceOutboxed.emit(jobStatusChanged);
 
-      JSONObject websocketEvent = setup.awaitCompleted(5, TimeUnit.SECONDS).get(0);
+      JSONObject websocketEvent = setup.awaitCompleted().getFirst();
 
       assertEquals("sapafcsdk.scheduling.WebsocketService", websocketEvent.get("event"));
       assertEquals("jobStatusChanged", websocketEvent.getJSONObject("message").get("event"));

java/project/srv/src/test/java/com/github/capjscommunity/sapafcsdk/test/OutboxTestSetup.java

@@ -25,6 +25,8 @@ public class OutboxTestSetup implements AutoCloseable {
   public final CountDownLatch messageCreated = new CountDownLatch(1);
   public final CountDownLatch messageDeleted = new CountDownLatch(1);
 
+  public final long Timeout = 10;
+
   public OutboxTestSetup(String serviceName, CdsRuntime cdsRuntime, PersistenceService persistenceService) {
     this.persistenceService = persistenceService;
     this.persistenceService.run(Delete.from(MESSAGES));
@@ -38,7 +40,7 @@ public OutboxTestSetup(String serviceName, CdsRuntime cdsRuntime, PersistenceSer
       if (!active) {
         return;
       }
-      String message = ((CdsCreateEventContextImpl) context).getCqn().entries().get(0).get("msg").toString();
+      String message = ((CdsCreateEventContextImpl) context).getCqn().entries().getFirst().get("msg").toString();
       messageEvents.add(new JSONObject(message));
       messageCreated.countDown();
     });
@@ -60,11 +62,11 @@ public void afterClose(boolean completed) {
     });
   }
 
-  public List<JSONObject> awaitCompleted(long timeout, TimeUnit unit) throws InterruptedException {
-    if (!messageCreated.await(timeout, unit)) {
+  public List<JSONObject> awaitCompleted() throws InterruptedException {
+    if (!messageCreated.await(Timeout, TimeUnit.SECONDS)) {
       throw new AssertionError("Timed out waiting for outbox CREATE");
     }
-    if (!messageDeleted.await(timeout, unit)) {
+    if (!messageDeleted.await(Timeout, TimeUnit.SECONDS)) {
       throw new AssertionError("Timed out waiting for outbox DELETE");
     }
     return messageEvents;