diff --git a/java/socketd-transport-test/src/test/java/features/CaseTest.java b/java/socketd-transport-test/src/test/java/features/CaseTest.java index de394a3294c4763c26e49db5ba4e20b69ad12f97..f420991369aaa8c158a166ad0832c5e043b1a783 100644 --- a/java/socketd-transport-test/src/test/java/features/CaseTest.java +++ b/java/socketd-transport-test/src/test/java/features/CaseTest.java @@ -12,7 +12,7 @@ import org.noear.solon.test.SolonTest; public class CaseTest { static final String[] schemas = new String[]{ "sd:tcp-java", - "sd:udp-neta", + "sd:tcp-neta", "sd:tcp-netty", "sd:tcp-smartsocket", "sd:tcp-neta", diff --git a/java/socketd-transport-test/src/test/java/features/cases/TestCase22_ssl.java b/java/socketd-transport-test/src/test/java/features/cases/TestCase22_ssl.java index 90cd730bc8c47b524d3633ee5d3ad86209dc86a3..f2d168b53dd01060a525c08f15ed858f0bacbe8f 100644 --- a/java/socketd-transport-test/src/test/java/features/cases/TestCase22_ssl.java +++ b/java/socketd-transport-test/src/test/java/features/cases/TestCase22_ssl.java @@ -1,6 +1,5 @@ package features.cases; -import net.hasor.cobble.ResourcesUtils; import org.junit.jupiter.api.Assertions; import org.noear.socketd.SocketD; import org.noear.socketd.transport.client.ClientSession; @@ -52,7 +51,7 @@ public class TestCase22_ssl extends BaseTestCase { public static SSLContext getSSLContext(String protocol) throws Exception { char[] password = "123456".toCharArray(); KeyStore jsk = KeyStore.getInstance("JKS"); - jsk.load(ResourcesUtils.getResourceAsStream("ssl/jks/keystore.jks"), password); + jsk.load(ClassLoader.getSystemResourceAsStream("ssl/jks/keystore.jks"), password); // Set up key manager factory to use our key store String keyAlgorithm = KeyManagerFactory.getDefaultAlgorithm(); diff --git a/java/socketd-transport/socketd-transport-neta/src/main/java/org/noear/socketd/transport/neta/listener/ClientListener.java b/java/socketd-transport/socketd-transport-neta/src/main/java/org/noear/socketd/transport/neta/listener/ClientListener.java index df5edb659eae97cf5c96182c109a43ebb00debf1..677e0f7b460793d1d4cb9779d266a78eb38351d1 100644 --- a/java/socketd-transport/socketd-transport-neta/src/main/java/org/noear/socketd/transport/neta/listener/ClientListener.java +++ b/java/socketd-transport/socketd-transport-neta/src/main/java/org/noear/socketd/transport/neta/listener/ClientListener.java @@ -1,15 +1,8 @@ package org.noear.socketd.transport.neta.listener; -import net.hasor.neta.channel.PlayLoad; -import net.hasor.neta.channel.PlayLoadListener; -import net.hasor.neta.channel.SoCloseException; -import net.hasor.neta.channel.SoTimeoutException; +import net.hasor.neta.channel.*; import org.noear.socketd.transport.client.ClientHandshakeResult; -import org.noear.socketd.transport.client.ClientInternal; -import org.noear.socketd.transport.core.ChannelInternal; -import org.noear.socketd.transport.core.Flags; -import org.noear.socketd.transport.core.Frame; -import org.noear.socketd.transport.core.Processor; +import org.noear.socketd.transport.core.*; import java.util.concurrent.CompletableFuture; @@ -21,7 +14,7 @@ public class ClientListener implements PlayLoadListener { private final Processor processor; private final CompletableFuture handshakeFuture = new CompletableFuture<>(); - public ClientListener(ClientInternal supporter) { + public ClientListener(ChannelSupporter supporter) { this.processor = supporter.getProcessor(); }