Revert "Java 21"

andytael · andytael · commit f530ca25dfb0 · 2024-05-10T09:38:24.000-05:00
This reverts commit 85892fe.
diff --git a/pom.xml b/pom.xml
@@ -189,7 +189,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
             -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE \
             -Drewrite.activeRecipes=org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2
              -->
-            <!-- <plugin>
+            <plugin>
                 <groupId>org.openrewrite.maven</groupId>
                 <artifactId>rewrite-maven-plugin</artifactId>
                 <version>5.30.0</version>
@@ -205,27 +205,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
                     <version>5.9.0</version>
                 </dependency>
                 </dependencies>
-            </plugin> -->
-                <!-- mvn -U org.openrewrite.maven:rewrite-maven-plugin:dryRun \
-            -Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE \
-            -Drewrite.activeRecipes=org.openrewrite.java.migrate.UpgradeToJava21 -->
-            <!-- <plugin>
-                <groupId>org.openrewrite.maven</groupId>
-                <artifactId>rewrite-maven-plugin</artifactId>
-                <version>5.30.0</version>
-                <configuration>
-                <activeRecipes>
-                    <recipe>org.openrewrite.java.migrate.UpgradeToJava21</recipe>
-                </activeRecipes>
-                </configuration>
-                <dependencies>
-                <dependency>
-                    <groupId>org.openrewrite.recipe</groupId>
-                    <artifactId>rewrite-migrate-java</artifactId>
-                    <version>2.13.0</version>
-                </dependency>
-                </dependencies>
-            </plugin> -->
+            </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
diff --git a/spring-cloud-oci-queue/src/main/java/com/oracle/cloud/spring/queue/QueueImpl.java b/spring-cloud-oci-queue/src/main/java/com/oracle/cloud/spring/queue/QueueImpl.java
@@ -154,7 +154,7 @@ public String createQueue(String queueName, String compartmentId, Integer deadLe
             waiter.execute();
             GetWorkRequestResponse workRequestResponse = queueAdminClient.getWorkRequest(workRequestRequest);
             WorkRequest workRequestData = workRequestResponse.getWorkRequest();
-            queueId = workRequestData.getResources().getFirst().getIdentifier();
+            queueId = workRequestData.getResources().get(0).getIdentifier();
         } catch (Exception e) {
             System.out.println(" queue build failed : " + e.getMessage());
         }
diff --git a/spring-cloud-oci-queue/src/test/java/com/oracle/cloud/spring/queue/QueueImplTests.java b/spring-cloud-oci-queue/src/test/java/com/oracle/cloud/spring/queue/QueueImplTests.java
@@ -39,7 +39,7 @@ void testQueueAdminClient() {
         when(queueAdminClient.getWaiters().forWorkRequest(any())).thenReturn(mock(Waiter.class));
         when(queueAdminClient.getWorkRequest(any()).getWorkRequest()).thenReturn(mock(WorkRequest.class));
         when(queueAdminClient.getWorkRequest(any()).getWorkRequest().getResources()).thenReturn(Arrays.asList(mock(WorkRequestResource.class)));
-        when(queueAdminClient.getWorkRequest(any()).getWorkRequest().getResources().getFirst().getIdentifier()).thenReturn("queueId");
+        when(queueAdminClient.getWorkRequest(any()).getWorkRequest().getResources().get(0).getIdentifier()).thenReturn("queueId");
         assertNotNull(queue.getQueueAdminClient());
         String queueId = queue.createQueue("test", "compartmentId", 30, 30);
         assertNotNull(queueId);
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-function-sample/src/main/java/com/oracle/cloud/spring/sample/function/springcloudocifunctionsample/FunctionController.java b/spring-cloud-oci-samples/spring-cloud-oci-function-sample/src/main/java/com/oracle/cloud/spring/sample/function/springcloudocifunctionsample/FunctionController.java
@@ -43,7 +43,7 @@ ResponseEntity<?> invoke(@Parameter(required = true, example = "functionOcid") @
                         " with opc request id " + invokeFunctionResponse.getOpcRequestId());
             }
 
-            responseContentType = invokeFunctionResponse.getHeaders().get(CONTENT_TYPE).getFirst();
+            responseContentType = invokeFunctionResponse.getHeaders().get(CONTENT_TYPE).get(0);
             response = new String(invokeFunctionResponse.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
         } catch (Exception ex) {
             ex.printStackTrace();
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-function-sample/src/main/resources/application.properties b/spring-cloud-oci-samples/spring-cloud-oci-function-sample/src/main/resources/application.properties
@@ -2,5 +2,4 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-ashburn-1
-spring.threads.virtual.enabled=true
 spring.cloud.oci.config.type = SESSION_TOKEN
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-logging-sample/src/main/resources/application.properties b/spring-cloud-oci-samples/spring-cloud-oci-logging-sample/src/main/resources/application.properties
@@ -2,7 +2,6 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-ashburn-1
-spring.threads.virtual.enabled=true
 
 spring.cloud.oci.logging.logId = <LOG_OCID>
 #spring.cloud.oci.config.type = RESOURCE_PRINCIPAL
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-notification-sample/src/main/resources/application.properties b/spring-cloud-oci-samples/spring-cloud-oci-notification-sample/src/main/resources/application.properties
@@ -2,5 +2,4 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-ashburn-1
-spring.threads.virtual.enabled=true
 #spring.cloud.oci.config.type = RESOURCE_PRINCIPAL
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-queue-sample/src/main/resources/application.properties b/spring-cloud-oci-samples/spring-cloud-oci-queue-sample/src/main/resources/application.properties
@@ -2,5 +2,4 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-ashburn-1
-spring.threads.virtual.enabled=true
 #spring.cloud.oci.config.type = RESOURCE_PRINCIPAL
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-queue-sample/src/test/java/com/oracle/cloud/spring/sample/queue/springcloudociqueuesample/SpringCloudOciQueueSampleApplicationTests.java b/spring-cloud-oci-samples/spring-cloud-oci-queue-sample/src/test/java/com/oracle/cloud/spring/sample/queue/springcloudociqueuesample/SpringCloudOciQueueSampleApplicationTests.java
@@ -85,7 +85,7 @@ void testGetMessages() {
         assertNotNull(response);
         int size = response.getGetMessages().getMessages().size();
         assertEquals(size, 2);
-        messageReceipt = response.getGetMessages().getMessages().getFirst().getReceipt();
+        messageReceipt = response.getGetMessages().getMessages().get(0).getReceipt();
     }
 
     @Test
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-storage-sample/src/main/resources/application.properties b/spring-cloud-oci-samples/spring-cloud-oci-storage-sample/src/main/resources/application.properties
@@ -2,7 +2,6 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-ashburn-1
-spring.threads.virtual.enabled=true
 spring.cloud.oci.compartment.static = <COMPARTMENT_OCID>
 
 #spring.cloud.oci.config.type = RESOURCE_PRINCIPAL
diff --git a/spring-cloud-oci-samples/spring-cloud-oci-streaming-sample/src/main/resources/application.properties b/spring-cloud-oci-samples/spring-cloud-oci-streaming-sample/src/main/resources/application.properties
@@ -2,6 +2,5 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 spring.cloud.oci.region.static = us-ashburn-1
-spring.threads.virtual.enabled=true
 
 #spring.cloud.oci.config.type = RESOURCE_PRINCIPAL

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public String createQueue(String queueName, String compartmentId, Integer deadLe`
`154`	`154`	`waiter.execute();`
`155`	`155`	`GetWorkRequestResponse workRequestResponse = queueAdminClient.getWorkRequest(workRequestRequest);`
`156`	`156`	`WorkRequest workRequestData = workRequestResponse.getWorkRequest();`
`157`		`- queueId = workRequestData.getResources().getFirst().getIdentifier();`
	`157`	`+ queueId = workRequestData.getResources().get(0).getIdentifier();`
`158`	`158`	`} catch (Exception e) {`
`159`	`159`	`System.out.println(" queue build failed : " + e.getMessage());`
`160`	`160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ ResponseEntity<?> invoke(@Parameter(required = true, example = "functionOcid") @`
`43`	`43`	`" with opc request id " + invokeFunctionResponse.getOpcRequestId());`
`44`	`44`	`}`
`45`	`45`
`46`		`- responseContentType = invokeFunctionResponse.getHeaders().get(CONTENT_TYPE).getFirst();`
	`46`	`+ responseContentType = invokeFunctionResponse.getHeaders().get(CONTENT_TYPE).get(0);`
`47`	`47`	`response = new String(invokeFunctionResponse.getInputStream().readAllBytes(), StandardCharsets.UTF_8);`
`48`	`48`	`} catch (Exception ex) {`
`49`	`49`	`ex.printStackTrace();`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ void testGetMessages() {`
`85`	`85`	`assertNotNull(response);`
`86`	`86`	`int size = response.getGetMessages().getMessages().size();`
`87`	`87`	`assertEquals(size, 2);`
`88`		`- messageReceipt = response.getGetMessages().getMessages().getFirst().getReceipt();`
	`88`	`+ messageReceipt = response.getGetMessages().getMessages().get(0).getReceipt();`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`@Test`