Merge pull request #1784 from smallrye/feat/switch-to-java17

Switch to Java 17

Author: cescoffier

.github/workflows/build-pull.yml

@@ -15,7 +15,6 @@ jobs:
     strategy:
       matrix:
         java: [
-          { 'version': '11', 'opts': '' },
           { 'version': '17', 'opts': '' },
           { 'version': '21', 'opts': '' },
           { 'version': '23', 'opts': '' }
@@ -51,7 +50,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
           cache: maven
       - name: Compatibility Check

.github/workflows/deploy-site.yml

@@ -26,7 +26,6 @@ jobs:
         run: |
           git config --global user.name "SmallRye CI"
           git config --global user.email "smallrye@googlegroups.com"
-          sudo snap install yq
       - name: Render docs and publish
         run: |
           export PROJECT_VERSION=$(cat .github/project.yml | yq eval '.release.current-version' -)

implementation/pom.xml

@@ -134,34 +134,6 @@
     </build>
 
     <profiles>
-        <profile>
-            <activation>
-                <jdk>[11,)</jdk>
-            </activation>
-            <id>java-11+</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <!-- wonderful reliability of javadoc used with modules breaking on non exposed packages -->
-                            <source>11</source>
-                            <release>11</release>
-                            <detectJavaApiLink>false</detectJavaApiLink>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>parallel-tests</id>
             <build>

implementation/revapi.json

@@ -64,6 +64,28 @@
         "old": "method void io.smallrye.mutiny.operators.multi.MultiEmitOnOp<T>::<init>(io.smallrye.mutiny.Multi<? extends T>, java.util.concurrent.Executor)",
         "new": "method void io.smallrye.mutiny.operators.multi.MultiEmitOnOp<T>::<init>(io.smallrye.mutiny.Multi<? extends T>, java.util.concurrent.Executor, int)",
         "justification": "The emitOn() internal buffer size must be configurable"
+      },
+      {
+        "ignore": true,
+        "code": "java.class.nonFinalClassInheritsFromNewClass",
+        "old": "class io.smallrye.mutiny.subscription.DemandPacer.Request",
+        "new": "class io.smallrye.mutiny.subscription.DemandPacer.Request",
+        "superClass": "java.lang.Record",
+        "justification": "Migration to a Java 17 record type"
+      },
+      {
+        "ignore": true,
+        "code": "java.class.kindChanged",
+        "old": "class io.smallrye.mutiny.subscription.DemandPacer.Request",
+        "new": "class io.smallrye.mutiny.subscription.DemandPacer.Request",
+        "justification": "Migration to a Java 17 record type"
+      },
+      {
+        "ignore": true,
+        "code": "java.class.nowFinal",
+        "old": "class io.smallrye.mutiny.subscription.DemandPacer.Request",
+        "new": "class io.smallrye.mutiny.subscription.DemandPacer.Request",
+        "justification": "Migration to a Java 17 record type"
       }
     ]
   }

implementation/src/main/java/io/smallrye/mutiny/helpers/test/AssertSubscriber.java

@@ -820,46 +820,18 @@ private void unregisterListener(EventListener listener) {
     private interface EventListener extends Consumer<Event> {
     }
 
-    private static class Event {
-
-        private final Object item;
-        private final Throwable failure;
-        private final boolean completion;
-        private final boolean cancellation;
-
-        private Event(Object item, Throwable failure, boolean completion, boolean cancellation) {
-            this.item = item;
-            this.failure = failure;
-            this.completion = completion;
-            this.cancellation = cancellation;
-        }
+    private record Event(Object item, Throwable failure, boolean completion, boolean cancellation) {
 
         public boolean isItem() {
             return item != null;
         }
 
-        public boolean isCancellation() {
-            return cancellation;
-        }
-
         public boolean isFailure() {
             return failure != null;
         }
-
-        public boolean isCompletion() {
-            return completion;
-        }
     }
 
-    private static class NextItemTask<T> {
-
-        private final int expected;
-        private final AssertSubscriber<T> subscriber;
-
-        public NextItemTask(int expected, AssertSubscriber<T> subscriber) {
-            this.expected = expected;
-            this.subscriber = subscriber;
-        }
+    private record NextItemTask<T>(int expected, AssertSubscriber<T> subscriber) {
 
         public CompletableFuture<Void> future() {
             CompletableFuture<Void> future = new CompletableFuture<>();
@@ -870,7 +842,7 @@ public CompletableFuture<Void> future() {
                     if (count.decrementAndGet() == 0) {
                         future.complete(null);
                     }
-                } else if (event.isCancellation() || event.isFailure() || event.isCompletion()) {
+                } else if (event.cancellation() || event.isFailure() || event.completion()) {
                     future.completeExceptionally(
                             new NoSuchElementException("Received a terminal event while waiting for items"));
                 }
@@ -882,17 +854,7 @@ public CompletableFuture<Void> future() {
         }
     }
 
-    private static class ItemTask<T> {
-
-        private final int expected;
-        private final AssertSubscriber<T> subscriber;
-        private final long duration;
-
-        public ItemTask(int expected, long duration, AssertSubscriber<T> subscriber) {
-            this.expected = expected;
-            this.subscriber = subscriber;
-            this.duration = duration;
-        }
+    private record ItemTask<T>(int expected, long duration, AssertSubscriber<T> subscriber) {
 
         public CompletableFuture<Void> future() {
             CompletableFuture<Void> future = new CompletableFuture<>();

implementation/src/main/java/io/smallrye/mutiny/helpers/test/AssertionHelper.java

@@ -159,7 +159,7 @@ private static String getItemList(Object[] items) {
     private static String getMismatches(Map<Object, Object> mismatches) {
         StringBuilder builder = new StringBuilder();
         for (Map.Entry<Object, Object> entry : mismatches.entrySet()) {
-            if (builder.length() != 0) {
+            if (!builder.isEmpty()) {
                 builder.append("\n");
             }
             if (entry.getValue() == null) {

implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java

@@ -30,8 +30,7 @@ public abstract class AbstractUni<T> implements Uni<T> {
      */
     @SuppressWarnings("unchecked")
     public static <T> void subscribe(Uni<? extends T> upstream, UniSubscriber<? super T> subscriber) {
-        if (upstream instanceof AbstractUni) {
-            AbstractUni abstractUni = (AbstractUni) upstream;
+        if (upstream instanceof AbstractUni abstractUni) {
             UniSubscriber actualSubscriber = Infrastructure.onUniSubscription(upstream, subscriber);
             abstractUni.subscribe(actualSubscriber);
         } else {

implementation/src/main/java/io/smallrye/mutiny/operators/multi/processors/SerializedProcessor.java

@@ -196,28 +196,13 @@ public void dispatch(List<Object> queue, Subscriber<I> subscriber) {
         }
     }
 
-    private static class SubscriptionEvent {
-        private final Subscription subscription;
-
-        private SubscriptionEvent(Subscription subscription) {
-            this.subscription = subscription;
-        }
+    private record SubscriptionEvent(Subscription subscription) {
     }
 
-    private static class ItemEvent<T> {
-        private final T item;
-
-        private ItemEvent(T item) {
-            this.item = item;
-        }
+    private record ItemEvent<T>(T item) {
     }
 
-    private static class FailureEvent {
-        private final Throwable failure;
-
-        private FailureEvent(Throwable failure) {
-            this.failure = failure;
-        }
+    private record FailureEvent(Throwable failure) {
     }
 
     private static class CompletionEvent {

implementation/src/main/java/io/smallrye/mutiny/subscription/DemandPacer.java

@@ -23,10 +23,7 @@ public interface DemandPacer {
     /**
      * A demand request.
      */
-    class Request {
-
-        private final long demand;
-        private final Duration delay;
+    record Request(long demand, Duration delay) {
 
         /**
          * Constructs a new request.
@@ -47,6 +44,7 @@ public Request(long demand, Duration delay) {
          *
          * @return the demand
          */
+        @Override
         public long demand() {
             return demand;
         }
@@ -56,6 +54,7 @@ public long demand() {
          *
          * @return the delay
          */
+        @Override
         public Duration delay() {
             return delay;
         }

implementation/src/main/java/io/smallrye/mutiny/tuples/Tuple2.java

@@ -93,12 +93,10 @@ public boolean equals(Object o) {
         if (this == o) {
             return true;
         }
-        if (!(o instanceof Tuple2)) {
+        if (!(o instanceof Tuple2<?, ?> pair)) {
             return false;
         }
 
-        Tuple2<?, ?> pair = (Tuple2<?, ?>) o;
-
         if (!Objects.equals(item1, pair.item1)) {
             return false;
         }