andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate UnaryPromiseNotifier

Browse Source 
Motivation:

Users should use PromiseNotifier.cascade(...) methods and so the UnaryPromiseNotifier becomes useless.

Modifications:

- Mark UnaryPromiseNotifier as deprecated
- Replaces usages with PromiseNotifier.cascade(...)

Result:

Cleanup
This commit is contained in:
Norman Maurer 2021-09-03 08:42:23 +02:00
parent 47bababfc7
commit e038fb7b0e
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec-http2/src/main/java/io/netty/handler/codec/http2/DefaultHttp2Connection.java
View File

@ -24,7 +24,7 @@ import io.netty.util.collection.IntObjectMap;
import io.netty.util.collection.IntObjectMap.PrimitiveEntry; import io.netty.util.collection.IntObjectMap.PrimitiveEntry;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.Promise; import io.netty.util.concurrent.Promise;
import io.netty.util.concurrent.UnaryPromiseNotifier; import io.netty.util.concurrent.PromiseNotifier;
import io.netty.util.internal.EmptyArrays; import io.netty.util.internal.EmptyArrays;
import io.netty.util.internal.UnstableApi; import io.netty.util.internal.UnstableApi;
import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
@ -128,7 +128,7 @@ public class DefaultHttp2Connection implements Http2Connection {
} else if (promise instanceof ChannelPromise && ((ChannelFuture) closePromise).isVoid()) { } else if (promise instanceof ChannelPromise && ((ChannelFuture) closePromise).isVoid()) {
closePromise = promise; closePromise = promise;
} else { } else {
closePromise.addListener(new UnaryPromiseNotifier<Void>(promise)); PromiseNotifier.cascade(closePromise, promise);
} }
} else { } else {
closePromise = promise; closePromise = promise;

5
common/src/main/java/io/netty/util/concurrent/UnaryPromiseNotifier.java
View File

@ -19,6 +19,11 @@ import io.netty.util.internal.ObjectUtil;
import io.netty.util.internal.logging.InternalLogger; import io.netty.util.internal.logging.InternalLogger;
import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.InternalLoggerFactory;
/**
*
* @deprecated use {@link PromiseNotifier#cascade(boolean, Future, Promise)}.
*/
@Deprecated
public final class UnaryPromiseNotifier<T> implements FutureListener<T> { public final class UnaryPromiseNotifier<T> implements FutureListener<T> {
private static final InternalLogger logger = InternalLoggerFactory.getInstance(UnaryPromiseNotifier.class); private static final InternalLogger logger = InternalLoggerFactory.getInstance(UnaryPromiseNotifier.class);
private final Promise<? super T> promise; private final Promise<? super T> promise;

6
handler/src/test/java/io/netty/handler/ssl/SSLEngineTest.java
View File

@ -41,7 +41,7 @@ import io.netty.util.CharsetUtil;
import io.netty.util.NetUtil; import io.netty.util.NetUtil;
import io.netty.util.ReferenceCountUtil; import io.netty.util.ReferenceCountUtil;
import io.netty.util.concurrent.ImmediateEventExecutor; import io.netty.util.concurrent.ImmediateEventExecutor;
import io.netty.util.concurrent.UnaryPromiseNotifier; import io.netty.util.concurrent.PromiseNotifier;
import io.netty.util.internal.ResourcesUtil; import io.netty.util.internal.ResourcesUtil;
import io.netty.util.concurrent.Future; import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.Promise; import io.netty.util.concurrent.Promise;
@ -1053,8 +1053,8 @@ public abstract class SSLEngineTest {
// through we just want to verify the local failure condition. This way we don't have to worry // through we just want to verify the local failure condition. This way we don't have to worry
// about verifying the payload and releasing the content on the server side. // about verifying the payload and releasing the content on the server side.
if (failureExpected) { if (failureExpected) {
ctx.write(ctx.alloc().buffer(1).writeByte(1)) ChannelFuture f = ctx.write(ctx.alloc().buffer(1).writeByte(1));
.addListener(new UnaryPromiseNotifier<Void>(clientWritePromise)); PromiseNotifier.cascade(f, clientWritePromise);
} }
} }