Fix merge conflicts

Author: AlbumenJ

dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/api/pu/AbstractPortUnificationServer.java

@@ -30,6 +30,9 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static org.apache.dubbo.common.constants.CommonConstants.COMMA_SEPARATOR;
+import static org.apache.dubbo.common.constants.CommonConstants.EXT_PROTOCOL;
+
 public abstract class AbstractPortUnificationServer extends AbstractServer {
 
     /**
@@ -60,11 +63,18 @@ public Map<String, WireProtocol> getProtocols() {
 
     @Override
     protected final void doOpen() {
-        ExtensionLoader<WireProtocol> extensionLoader =
+        ExtensionLoader<WireProtocol> loader =
                 getUrl().getOrDefaultFrameworkModel().getExtensionLoader(WireProtocol.class);
-        this.protocols = extensionLoader.getActivateExtension(getUrl(), new String[0]).stream()
-                .collect(Collectors.toConcurrentMap(extensionLoader::getExtensionName, Function.identity()));
-
+        Map<String, WireProtocol> protocols = loader.getActivateExtension(getUrl(), new String[0]).stream()
+                .collect(Collectors.toConcurrentMap(loader::getExtensionName, Function.identity()));
+        // load extra protocols
+        String extraProtocols = getUrl().getParameter(EXT_PROTOCOL);
+        if (StringUtils.isNotEmpty(extraProtocols)) {
+            Arrays.stream(extraProtocols.split(COMMA_SEPARATOR)).forEach(p -> {
+                protocols.put(p, loader.getExtension(p));
+            });
+        }
+        this.protocols = protocols;
         doOpen0();
     }
 

dubbo-rpc/dubbo-rpc-triple/src/main/java/org/apache/dubbo/rpc/protocol/tri/stream/AbstractTripleClientStream.java

@@ -19,6 +19,8 @@
 import org.apache.dubbo.common.constants.CommonConstants;
 import org.apache.dubbo.common.logger.ErrorTypeAwareLogger;
 import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.remoting.Constants;
+import org.apache.dubbo.remoting.http12.HttpHeaderNames;
 import org.apache.dubbo.rpc.TriRpcStatus;
 import org.apache.dubbo.rpc.model.FrameworkModel;
 import org.apache.dubbo.rpc.protocol.tri.ClassLoadUtil;
@@ -57,7 +59,7 @@
 import io.netty.handler.codec.http2.Http2Error;
 import io.netty.handler.codec.http2.Http2Headers;
 import io.netty.handler.codec.http2.Http2StreamChannel;
-import io.netty.handler.codec.http2.Http2StreamChannelBootstrap;
+import io.netty.util.AttributeKey;
 import io.netty.util.ReferenceCountUtil;
 
 import static org.apache.dubbo.common.constants.LoggerCodeConstants.PROTOCOL_FAILED_RESPONSE;

dubbo-serialization/dubbo-serialization-fastjson2/src/main/java/org/apache/dubbo/common/serialize/fastjson2/Fastjson2ScopeModelInitializer.java

@@ -18,7 +18,6 @@
 
 import org.apache.dubbo.common.beans.factory.ScopeBeanFactory;
 import org.apache.dubbo.common.utils.ClassUtils;
-import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.rpc.model.FrameworkModel;
 import org.apache.dubbo.rpc.model.ScopeModelInitializer;