Enable additional methods in MoreExecutors for J2kt-native

stefanhaustein · Google Java Core Libraries · commit cf77dacd2273 · 2025-02-12T09:47:46.000-08:00
RELNOTES=n/a
PiperOrigin-RevId: 726090734
diff --git a/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java b/android/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java
@@ -15,7 +15,6 @@
 package com.google.common.util.concurrent;
 
 import com.google.common.annotations.GwtIncompatible;
-import com.google.common.annotations.J2ktIncompatible;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.CheckReturnValue;
 import java.util.concurrent.AbstractExecutorService;
@@ -36,7 +35,6 @@
  */
 @CheckReturnValue
 @GwtIncompatible
-@J2ktIncompatible
 public abstract class AbstractListeningExecutorService extends AbstractExecutorService
     implements ListeningExecutorService {
   /** Constructor for use by subclasses. */
diff --git a/android/guava/src/com/google/common/util/concurrent/MoreExecutors.java b/android/guava/src/com/google/common/util/concurrent/MoreExecutors.java
@@ -461,7 +461,6 @@ public static Executor newSequentialExecutor(Executor delegate) {
    *
    * @since 10.0
    */
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   public static ListeningExecutorService listeningDecorator(ExecutorService delegate) {
     return (delegate instanceof ListeningExecutorService)
@@ -487,7 +486,6 @@ public static ListeningExecutorService listeningDecorator(ExecutorService delega
    *
    * @since 10.0
    */
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   public static ListeningScheduledExecutorService listeningDecorator(
       ScheduledExecutorService delegate) {
@@ -496,7 +494,6 @@ public static ListeningScheduledExecutorService listeningDecorator(
         : new ScheduledListeningDecorator(delegate);
   }
 
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   private static class ListeningDecorator extends AbstractListeningExecutorService {
     private final ExecutorService delegate;
@@ -541,7 +538,6 @@ public final String toString() {
     }
   }
 
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   private static final class ScheduledListeningDecorator extends ListeningDecorator
       implements ListeningScheduledExecutorService {
@@ -620,7 +616,6 @@ public int compareTo(Delayed other) {
       }
     }
 
-    @J2ktIncompatible
     @GwtIncompatible // TODO
     private static final class NeverSuccessfulListenableFutureTask
         extends AbstractFuture.TrustedFuture<@Nullable Void> implements Runnable {
diff --git a/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java b/guava/src/com/google/common/util/concurrent/AbstractListeningExecutorService.java
@@ -15,7 +15,6 @@
 package com.google.common.util.concurrent;
 
 import com.google.common.annotations.GwtIncompatible;
-import com.google.common.annotations.J2ktIncompatible;
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.CheckReturnValue;
 import java.util.concurrent.AbstractExecutorService;
@@ -36,7 +35,6 @@
  */
 @CheckReturnValue
 @GwtIncompatible
-@J2ktIncompatible
 public abstract class AbstractListeningExecutorService extends AbstractExecutorService
     implements ListeningExecutorService {
   /** Constructor for use by subclasses. */
diff --git a/guava/src/com/google/common/util/concurrent/MoreExecutors.java b/guava/src/com/google/common/util/concurrent/MoreExecutors.java
@@ -455,7 +455,6 @@ public static Executor newSequentialExecutor(Executor delegate) {
    *
    * @since 10.0
    */
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   public static ListeningExecutorService listeningDecorator(ExecutorService delegate) {
     return (delegate instanceof ListeningExecutorService)
@@ -481,7 +480,6 @@ public static ListeningExecutorService listeningDecorator(ExecutorService delega
    *
    * @since 10.0
    */
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   public static ListeningScheduledExecutorService listeningDecorator(
       ScheduledExecutorService delegate) {
@@ -490,7 +488,6 @@ public static ListeningScheduledExecutorService listeningDecorator(
         : new ScheduledListeningDecorator(delegate);
   }
 
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   private static class ListeningDecorator extends AbstractListeningExecutorService {
     private final ExecutorService delegate;
@@ -535,7 +532,6 @@ public final String toString() {
     }
   }
 
-  @J2ktIncompatible
   @GwtIncompatible // TODO
   private static final class ScheduledListeningDecorator extends ListeningDecorator
       implements ListeningScheduledExecutorService {
@@ -614,7 +610,6 @@ public int compareTo(Delayed other) {
       }
     }
 
-    @J2ktIncompatible
     @GwtIncompatible // TODO
     private static final class NeverSuccessfulListenableFutureTask
         extends AbstractFuture.TrustedFuture<@Nullable Void> implements Runnable {

Original file line number	Diff line number	Diff line change
`@@ -461,7 +461,6 @@ public static Executor newSequentialExecutor(Executor delegate) {`
`461`	`461`	`*`
`462`	`462`	`* @since 10.0`
`463`	`463`	`*/`
`464`		`- @J2ktIncompatible`
`465`	`464`	`@GwtIncompatible // TODO`
`466`	`465`	`public static ListeningExecutorService listeningDecorator(ExecutorService delegate) {`
`467`	`466`	`return (delegate instanceof ListeningExecutorService)`
`@@ -487,7 +486,6 @@ public static ListeningExecutorService listeningDecorator(ExecutorService delega`
`487`	`486`	`*`
`488`	`487`	`* @since 10.0`
`489`	`488`	`*/`
`490`		`- @J2ktIncompatible`
`491`	`489`	`@GwtIncompatible // TODO`
`492`	`490`	`public static ListeningScheduledExecutorService listeningDecorator(`
`493`	`491`	`ScheduledExecutorService delegate) {`
`@@ -496,7 +494,6 @@ public static ListeningScheduledExecutorService listeningDecorator(`
`496`	`494`	`: new ScheduledListeningDecorator(delegate);`
`497`	`495`	`}`
`498`	`496`
`499`		`- @J2ktIncompatible`
`500`	`497`	`@GwtIncompatible // TODO`
`501`	`498`	`private static class ListeningDecorator extends AbstractListeningExecutorService {`
`502`	`499`	`private final ExecutorService delegate;`
`@@ -541,7 +538,6 @@ public final String toString() {`
`541`	`538`	`}`
`542`	`539`	`}`
`543`	`540`
`544`		`- @J2ktIncompatible`
`545`	`541`	`@GwtIncompatible // TODO`
`546`	`542`	`private static final class ScheduledListeningDecorator extends ListeningDecorator`
`547`	`543`	`implements ListeningScheduledExecutorService {`
`@@ -620,7 +616,6 @@ public int compareTo(Delayed other) {`
`620`	`616`	`}`
`621`	`617`	`}`
`622`	`618`
`623`		`- @J2ktIncompatible`
`624`	`619`	`@GwtIncompatible // TODO`
`625`	`620`	`private static final class NeverSuccessfulListenableFutureTask`
`626`	`621`	`extends AbstractFuture.TrustedFuture<@Nullable Void> implements Runnable {`
Original file line number	Diff line number	Diff line change
`@@ -455,7 +455,6 @@ public static Executor newSequentialExecutor(Executor delegate) {`
`455`	`455`	`*`
`456`	`456`	`* @since 10.0`
`457`	`457`	`*/`
`458`		`- @J2ktIncompatible`
`459`	`458`	`@GwtIncompatible // TODO`
`460`	`459`	`public static ListeningExecutorService listeningDecorator(ExecutorService delegate) {`
`461`	`460`	`return (delegate instanceof ListeningExecutorService)`
`@@ -481,7 +480,6 @@ public static ListeningExecutorService listeningDecorator(ExecutorService delega`
`481`	`480`	`*`
`482`	`481`	`* @since 10.0`
`483`	`482`	`*/`
`484`		`- @J2ktIncompatible`
`485`	`483`	`@GwtIncompatible // TODO`
`486`	`484`	`public static ListeningScheduledExecutorService listeningDecorator(`
`487`	`485`	`ScheduledExecutorService delegate) {`
`@@ -490,7 +488,6 @@ public static ListeningScheduledExecutorService listeningDecorator(`
`490`	`488`	`: new ScheduledListeningDecorator(delegate);`
`491`	`489`	`}`
`492`	`490`
`493`		`- @J2ktIncompatible`
`494`	`491`	`@GwtIncompatible // TODO`
`495`	`492`	`private static class ListeningDecorator extends AbstractListeningExecutorService {`
`496`	`493`	`private final ExecutorService delegate;`
`@@ -535,7 +532,6 @@ public final String toString() {`
`535`	`532`	`}`
`536`	`533`	`}`
`537`	`534`
`538`		`- @J2ktIncompatible`
`539`	`535`	`@GwtIncompatible // TODO`
`540`	`536`	`private static final class ScheduledListeningDecorator extends ListeningDecorator`
`541`	`537`	`implements ListeningScheduledExecutorService {`
`@@ -614,7 +610,6 @@ public int compareTo(Delayed other) {`
`614`	`610`	`}`
`615`	`611`	`}`
`616`	`612`
`617`		`- @J2ktIncompatible`
`618`	`613`	`@GwtIncompatible // TODO`
`619`	`614`	`private static final class NeverSuccessfulListenableFutureTask`
`620`	`615`	`extends AbstractFuture.TrustedFuture<@Nullable Void> implements Runnable {`