Skip to content

Commit 85892fe

Browse files
committed
Java 21
1 parent d24d695 commit 85892fe

File tree

11 files changed

+32
-6
lines changed

11 files changed

+32
-6
lines changed

pom.xml

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
189189
-Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE \
190190
-Drewrite.activeRecipes=org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2
191191
-->
192-
<plugin>
192+
<!-- <plugin>
193193
<groupId>org.openrewrite.maven</groupId>
194194
<artifactId>rewrite-maven-plugin</artifactId>
195195
<version>5.30.0</version>
@@ -205,7 +205,27 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
205205
<version>5.9.0</version>
206206
</dependency>
207207
</dependencies>
208-
</plugin>
208+
</plugin> -->
209+
<!-- mvn -U org.openrewrite.maven:rewrite-maven-plugin:dryRun \
210+
-Drewrite.recipeArtifactCoordinates=org.openrewrite.recipe:rewrite-spring:RELEASE \
211+
-Drewrite.activeRecipes=org.openrewrite.java.migrate.UpgradeToJava21 -->
212+
<!-- <plugin>
213+
<groupId>org.openrewrite.maven</groupId>
214+
<artifactId>rewrite-maven-plugin</artifactId>
215+
<version>5.30.0</version>
216+
<configuration>
217+
<activeRecipes>
218+
<recipe>org.openrewrite.java.migrate.UpgradeToJava21</recipe>
219+
</activeRecipes>
220+
</configuration>
221+
<dependencies>
222+
<dependency>
223+
<groupId>org.openrewrite.recipe</groupId>
224+
<artifactId>rewrite-migrate-java</artifactId>
225+
<version>2.13.0</version>
226+
</dependency>
227+
</dependencies>
228+
</plugin> -->
209229
<plugin>
210230
<groupId>org.apache.maven.plugins</groupId>
211231
<artifactId>maven-javadoc-plugin</artifactId>

spring-cloud-oci-queue/src/main/java/com/oracle/cloud/spring/queue/QueueImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ public String createQueue(String queueName, String compartmentId, Integer deadLe
154154
waiter.execute();
155155
GetWorkRequestResponse workRequestResponse = queueAdminClient.getWorkRequest(workRequestRequest);
156156
WorkRequest workRequestData = workRequestResponse.getWorkRequest();
157-
queueId = workRequestData.getResources().get(0).getIdentifier();
157+
queueId = workRequestData.getResources().getFirst().getIdentifier();
158158
} catch (Exception e) {
159159
System.out.println(" queue build failed : " + e.getMessage());
160160
}

spring-cloud-oci-queue/src/test/java/com/oracle/cloud/spring/queue/QueueImplTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void testQueueAdminClient() {
3939
when(queueAdminClient.getWaiters().forWorkRequest(any())).thenReturn(mock(Waiter.class));
4040
when(queueAdminClient.getWorkRequest(any()).getWorkRequest()).thenReturn(mock(WorkRequest.class));
4141
when(queueAdminClient.getWorkRequest(any()).getWorkRequest().getResources()).thenReturn(Arrays.asList(mock(WorkRequestResource.class)));
42-
when(queueAdminClient.getWorkRequest(any()).getWorkRequest().getResources().get(0).getIdentifier()).thenReturn("queueId");
42+
when(queueAdminClient.getWorkRequest(any()).getWorkRequest().getResources().getFirst().getIdentifier()).thenReturn("queueId");
4343
assertNotNull(queue.getQueueAdminClient());
4444
String queueId = queue.createQueue("test", "compartmentId", 30, 30);
4545
assertNotNull(queueId);

spring-cloud-oci-samples/spring-cloud-oci-function-sample/src/main/java/com/oracle/cloud/spring/sample/function/springcloudocifunctionsample/FunctionController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ ResponseEntity<?> invoke(@Parameter(required = true, example = "functionOcid") @
4343
" with opc request id " + invokeFunctionResponse.getOpcRequestId());
4444
}
4545

46-
responseContentType = invokeFunctionResponse.getHeaders().get(CONTENT_TYPE).get(0);
46+
responseContentType = invokeFunctionResponse.getHeaders().get(CONTENT_TYPE).getFirst();
4747
response = new String(invokeFunctionResponse.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
4848
} catch (Exception ex) {
4949
ex.printStackTrace();

spring-cloud-oci-samples/spring-cloud-oci-function-sample/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring.cloud.oci.region.static = us-ashburn-1
5+
spring.threads.virtual.enabled=true
56
spring.cloud.oci.config.type = SESSION_TOKEN

spring-cloud-oci-samples/spring-cloud-oci-logging-sample/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring.cloud.oci.region.static = us-ashburn-1
5+
spring.threads.virtual.enabled=true
56

67
spring.cloud.oci.logging.logId = <LOG_OCID>
78
#spring.cloud.oci.config.type = RESOURCE_PRINCIPAL

spring-cloud-oci-samples/spring-cloud-oci-notification-sample/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring.cloud.oci.region.static = us-ashburn-1
5+
spring.threads.virtual.enabled=true
56
#spring.cloud.oci.config.type = RESOURCE_PRINCIPAL

spring-cloud-oci-samples/spring-cloud-oci-queue-sample/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring.cloud.oci.region.static = us-ashburn-1
5+
spring.threads.virtual.enabled=true
56
#spring.cloud.oci.config.type = RESOURCE_PRINCIPAL

spring-cloud-oci-samples/spring-cloud-oci-queue-sample/src/test/java/com/oracle/cloud/spring/sample/queue/springcloudociqueuesample/SpringCloudOciQueueSampleApplicationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ void testGetMessages() {
8585
assertNotNull(response);
8686
int size = response.getGetMessages().getMessages().size();
8787
assertEquals(size, 2);
88-
messageReceipt = response.getGetMessages().getMessages().get(0).getReceipt();
88+
messageReceipt = response.getGetMessages().getMessages().getFirst().getReceipt();
8989
}
9090

9191
@Test

spring-cloud-oci-samples/spring-cloud-oci-storage-sample/src/main/resources/application.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
33

44
spring.cloud.oci.region.static = us-ashburn-1
5+
spring.threads.virtual.enabled=true
56
spring.cloud.oci.compartment.static = <COMPARTMENT_OCID>
67

78
#spring.cloud.oci.config.type = RESOURCE_PRINCIPAL

0 commit comments

Comments
 (0)