diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java index a5a0a4c26..a5ecd5018 100644 --- a/src/org/redkale/boot/NodeServer.java +++ b/src/org/redkale/boot/NodeServer.java @@ -354,9 +354,7 @@ public abstract class NodeServer { protected Transport loadTransport(final HashSet groups) { if (groups == null || groups.isEmpty()) return null; - List tmpgroup = new ArrayList<>(groups); - Collections.sort(tmpgroup); //按字母排列顺序 - final String groupid = tmpgroup.stream().collect(Collectors.joining(";")); + final String groupid = new ArrayList<>(groups).stream().sorted().collect(Collectors.joining(";")); //按字母排列顺序 Transport transport = application.resourceFactory.find(groupid, Transport.class); if (transport != null) return transport; final List transports = new ArrayList<>(); diff --git a/src/org/redkale/net/Transport.java b/src/org/redkale/net/Transport.java index 89798fd49..33d4a5c7a 100644 --- a/src/org/redkale/net/Transport.java +++ b/src/org/redkale/net/Transport.java @@ -6,14 +6,14 @@ package org.redkale.net; import java.net.*; -import java.nio.*; +import java.nio.ByteBuffer; import java.nio.channels.*; import java.util.*; import java.util.concurrent.*; -import java.util.function.*; -import java.util.stream.*; -import org.redkale.util.*; -import org.redkale.watch.*; +import java.util.function.Supplier; +import java.util.stream.Collectors; +import org.redkale.util.ObjectPool; +import org.redkale.watch.WatchFactory; /** * 传输客户端 @@ -84,8 +84,8 @@ public final class Transport { if (first == null) first = t; tmpgroup.add(t.name); } - Collections.sort(tmpgroup); //必须按字母排列顺序确保,相同内容的transport列表组合的name相同,而不会因为list的顺序不同产生不同的name - this.name = tmpgroup.stream().collect(Collectors.joining(";")); + //必须按字母排列顺序确保,相同内容的transport列表组合的name相同,而不会因为list的顺序不同产生不同的name + this.name = tmpgroup.stream().sorted().collect(Collectors.joining(";")); this.watch = first.watch; this.protocol = first.protocol; this.tcp = "TCP".equalsIgnoreCase(first.protocol);