JDK 21 (#58)

* jdk 21

how could I forget

* Update Dockerfile

* Update main.yml

* Update pom.xml

* Update ConnectController.java

* Update Dockerfile

Author: SentryMan

.github/workflows/main.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Java
         uses: actions/setup-java@v1
         with:
-          java-version: "20"
+          java-version: "21"
           java-package: jdk
           architecture: x64
 

Dockerfile

@@ -1,12 +1,11 @@
-FROM amazoncorretto:20-alpine-jdk as jreBuilder
+FROM amazoncorretto:21-alpine-jdk as jreBuilder
 
 RUN apk add binutils
 RUN jlink \
     --add-modules \
-    java.base,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.sql,java.xml,jdk.crypto.ec,jdk.naming.dns,jdk.unsupported,jdk.incubator.concurrent\
+    java.base,java.desktop,java.instrument,java.logging,java.management,java.naming,java.net.http,java.sql,java.xml,jdk.crypto.ec,jdk.naming.dns,jdk.unsupported\
     --verbose \
     --strip-debug \
-    --compress 2 \
     --no-header-files \
     --no-man-pages \
     --output /jre
@@ -15,5 +14,5 @@ FROM alpine
 
 COPY --from=jreBuilder /jre /usr/lib/jre
 COPY ./target/manga-backend-*jar manga-backend.jar
-ENTRYPOINT ["/usr/lib/jre/bin/java","--enable-preview", "--add-modules=jdk.incubator.concurrent", "-XX:MaxRAMPercentage=80.0","-jar", "./manga-backend.jar"]
+ENTRYPOINT ["/usr/lib/jre/bin/java","--enable-preview", "-XX:MaxRAMPercentage=80.0","-jar", "./manga-backend.jar"]
 

pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.2</version>
+		<version>3.1.5</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.mangasite</groupId>
@@ -13,8 +13,8 @@
 	<name>MangaBackend</name>
 	<description>RSocket API for Manga-Spring Site</description>
 	<properties>
-		<java.version>20</java.version>
-		<avaje.inject.version>9.2</avaje.inject.version>
+		<java.version>21</java.version>
+		<avaje.inject.version>9.10</avaje.inject.version>
 		<mainClass>com.mangasite.MangaBackendApplication</mainClass>
 		<start-class>com.mangasite.MangaBackendApplication</start-class>
 	</properties>
@@ -35,7 +35,7 @@
 		<dependency>
 			<groupId>io.avaje</groupId>
 			<artifactId>avaje-config</artifactId>
-			<version>2.5</version>
+			<version>3.10</version>
 		</dependency>
 		<dependency>
 			<groupId>com.auth0</groupId>
@@ -61,10 +61,6 @@
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-config</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.projectreactor.addons</groupId>
-			<artifactId>reactor-extra</artifactId>
-		</dependency>
 		<!-- RSocket Dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -122,7 +118,7 @@
 			<plugin>
 				<groupId>com.spotify.fmt</groupId>
 				<artifactId>fmt-maven-plugin</artifactId>
-				<version>2.19</version>
+				<version>2.21</version>
 				<configuration>
 					<skipSortingImports>true</skipSortingImports>
 				</configuration>

src/main/java/com/mangasite/rsocket/ConnectController.java

@@ -2,8 +2,9 @@
 
 import static com.mangasite.security.AppRole.ADMIN;
 import static com.mangasite.security.AppRole.getByUserName;
-import static reactor.function.TupleUtils.consumer;
 
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import org.springframework.messaging.handler.annotation.Payload;
@@ -15,6 +16,7 @@
 import com.mangasite.services.ConnectService;
 
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
 @Controller
@@ -40,4 +42,8 @@ public Mono<Void> onConnect(
         .doOnNext(consumer(ConnectService::requestDeviceInfo))
         .then();
   }
+
+  private <T, T2> Consumer<? super Tuple2<T, T2>> consumer(BiConsumer<T, T2> bi) {
+    return t -> bi.accept(t.getT1(), t.getT2());
+  }
 }