Merge pull request #1548 from jponge/style/deprecate-for-removal

style: explicitly mark deprecated methods for removal
smallrye · Mar 14, 2024 · cc7b163 · cc7b163
2 parents 81d78ef + 4f85db6
commit cc7b163
Show file tree

Hide file tree

Showing 11 changed files with 1,144 additions and 1,074 deletions.
diff --git a/implementation/revapi.json b/implementation/revapi.json
diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup2.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup2.java
@@ -55,7 +55,7 @@ public Uni<Tuple2<T1, T2>> asTuple() {
      * @return the resulting {@code Uni<O>}. The items are combined into {@link O}
      * @deprecated use {@link #with(BiFunction)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(BiFunction<T1, T2, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup3.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup3.java
@@ -33,7 +33,7 @@ public Uni<Tuple3<T1, T2, T3>> asTuple() {
     /**
      * @deprecated use {@link #with(Functions.Function3)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Functions.Function3<T1, T2, T3, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup4.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup4.java
@@ -33,7 +33,7 @@ public Uni<Tuple4<T1, T2, T3, T4>> asTuple() {
     /**
      * @deprecated use {@link #with(Functions.Function4)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Functions.Function4<T1, T2, T3, T4, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup5.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup5.java
@@ -34,7 +34,7 @@ public Uni<Tuple5<T1, T2, T3, T4, T5>> asTuple() {
     /**
      * @deprecated use {@link #with(Functions.Function5)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Functions.Function5<T1, T2, T3, T4, T5, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup6.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup6.java
@@ -34,7 +34,7 @@ public Uni<Tuple6<T1, T2, T3, T4, T5, T6>> asTuple() {
     /**
      * @deprecated use {@link #with(Functions.Function6)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Functions.Function6<T1, T2, T3, T4, T5, T6, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup7.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup7.java
@@ -34,7 +34,7 @@ public Uni<Tuple7<T1, T2, T3, T4, T5, T6, T7>> asTuple() {
     /**
      * @deprecated use {@link #with(Functions.Function7)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Functions.Function7<T1, T2, T3, T4, T5, T6, T7, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup8.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup8.java
@@ -36,7 +36,7 @@ public Uni<Tuple8<T1, T2, T3, T4, T5, T6, T7, T8>> asTuple() {
     /**
      * @deprecated use {@link #with(Functions.Function8)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Functions.Function8<T1, T2, T3, T4, T5, T6, T7, T8, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup9.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroup9.java
@@ -36,7 +36,7 @@ public Uni<Tuple9<T1, T2, T3, T4, T5, T6, T7, T8, T9>> asTuple() {
     /**
      * @deprecated use {@link #with(Functions.Function9)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Functions.Function9<T1, T2, T3, T4, T5, T6, T7, T8, T9, O> combinator) {
         return with(combinator);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroupIterable.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniAndGroupIterable.java
@@ -74,7 +74,7 @@ public UniAndGroupIterable<T1> usingConcurrencyOf(int level) {
      * @return the new {@link Uni}
      * @deprecated use {{@link #with(Function)}} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O> Uni<O> combinedWith(Function<List<?>, O> function) {
         return with(function);
@@ -127,7 +127,7 @@ public <O> Uni<O> withUni(Function<List<?>, Uni<O>> function) {
      * @return the new {@link Uni}
      * @deprecated use {@link #with(Class, Function)} instead
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public <O, I> Uni<O> combinedWith(Class<I> superType, Function<List<I>, O> function) {
         return with(superType, function);

diff --git a/implementation/src/main/java/io/smallrye/mutiny/groups/UniMemoize.java b/implementation/src/main/java/io/smallrye/mutiny/groups/UniMemoize.java
@@ -52,7 +52,7 @@ public Uni<T> until(BooleanSupplier invalidationGuard) {
      * @apiNote This is an experimental API
      * @deprecated use {@link #forFixedDuration(Duration)} instead.
      */
-    @Deprecated
+    @Deprecated(forRemoval = true)
     @CheckReturnValue
     public Uni<T> atLeast(Duration duration) {
         return forFixedDuration(duration);