Browse Source

Pull request #6882: REPORT-78074 netty内置

Merge in CORE/base-third from ~YUAN.WANG/base-third:feature/x to feature/x

* commit '7a2983ad3535a896b9418990be9ef72bb8c7788d':
  REPORT-78074 netty内置
feature/x
Yuan.Wang-王垣 2 years ago
parent
commit
0642fd805f
  1. 1
      fine-netty/src/main/java/io/netty/handler/codec/compression/ZstdEncoder.java
  2. 2
      fine-netty/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java
  3. 23
      fine-netty/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java

1
fine-netty/src/main/java/io/netty/handler/codec/compression/ZstdEncoder.java

@ -15,6 +15,7 @@
*/ */
package io.netty.handler.codec.compression; package io.netty.handler.codec.compression;
import com.github.luben.zstd.Zstd;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.Unpooled; import io.netty.buffer.Unpooled;
import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelHandlerContext;

2
fine-netty/src/main/java/io/netty/handler/codec/protobuf/ProtobufEncoder.java

@ -26,6 +26,8 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.netty.handler.codec.LengthFieldPrepender; import io.netty.handler.codec.LengthFieldPrepender;
import io.netty.handler.codec.MessageToMessageEncoder; import io.netty.handler.codec.MessageToMessageEncoder;
import static io.netty.buffer.Unpooled.*;
import java.util.List; import java.util.List;
/** /**

23
fine-netty/src/main/java/io/netty/handler/ssl/ConscryptAlpnSslEngine.java

@ -15,26 +15,27 @@
*/ */
package io.netty.handler.ssl; package io.netty.handler.ssl;
import static io.netty.handler.ssl.SslUtils.toSSLHandshakeException;
import static io.netty.util.internal.ObjectUtil.checkNotNull;
import static java.lang.Math.min;
import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufAllocator; import io.netty.buffer.ByteBufAllocator;
import io.netty.handler.ssl.JdkApplicationProtocolNegotiator.ProtocolSelectionListener; import io.netty.handler.ssl.JdkApplicationProtocolNegotiator.ProtocolSelectionListener;
import io.netty.handler.ssl.JdkApplicationProtocolNegotiator.ProtocolSelector; import io.netty.handler.ssl.JdkApplicationProtocolNegotiator.ProtocolSelector;
import io.netty.util.internal.SystemPropertyUtil;
import org.conscrypt.AllocatedBuffer;
import org.conscrypt.BufferAllocator;
import org.conscrypt.HandshakeListener;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.Collections; import java.util.Collections;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLEngineResult;
import javax.net.ssl.SSLException;
import static io.netty.handler.ssl.SslUtils.toSSLHandshakeException; import io.netty.util.internal.SystemPropertyUtil;
import static io.netty.util.internal.ObjectUtil.checkNotNull; import org.conscrypt.AllocatedBuffer;
import static java.lang.Math.min; import org.conscrypt.BufferAllocator;
import org.conscrypt.Conscrypt;
import org.conscrypt.HandshakeListener;
/** /**
* A {@link JdkSslEngine} that uses the Conscrypt provider or SSL with ALPN. * A {@link JdkSslEngine} that uses the Conscrypt provider or SSL with ALPN.

Loading…
Cancel
Save