Skip to content

Commit d406c3d

Browse files
committed
refactor: extract module
1 parent 60f1e10 commit d406c3d

73 files changed

Lines changed: 1421 additions & 1855 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

noone-core/build.gradle.kts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,16 @@ configurations {
3636
}
3737

3838
dependencies {
39+
implementation(project(":noone-transport"))
3940
implementation(libs.byte.buddy)
4041
implementation(libs.asm.commons)
4142
implementation(libs.commons.lang3)
42-
implementation(libs.okhttp3)
4343
implementation(libs.fastjson2)
44-
implementation(libs.memshell.party.generator) {
44+
api(libs.memshell.party.generator) {
4545
exclude(group = "io.netty", module = "netty-transport-native-kqueue")
4646
}
47-
implementation(libs.memshell.party.common)
47+
api(libs.memshell.party.common)
4848
implementation(libs.memshell.party.thirdparty.tomcat)
49-
implementation(libs.dubbo) {
50-
exclude(group = "io.netty", module = "netty-transport-native-kqueue")
51-
}
52-
implementation(libs.dubbo.rpc.hessian)
53-
implementation(libs.dubbo.remoting.http)
5449
implementation(libs.reactor.netty.core)
5550
implementation(libs.spring.webflux)
5651
implementation(libs.spring.webmvc)
@@ -59,8 +54,6 @@ dependencies {
5954
implementation(libs.jetbrains.annotations)
6055
implementation(libs.slf4j.api)
6156
implementation("com.fasterxml.jackson.core:jackson-annotations:2.21")
62-
63-
testImplementation(libs.okhttp3.mockwebserver)
6457
testImplementation(libs.bundles.mockito)
6558
testImplementation(libs.junit.jupiter)
6659
testImplementation("org.springframework:spring-test:5.3.24")

noone-core/src/legacy8/java/com/reajason/noone/core/NoOneCore.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ public Map<String, Object> run(Map<String, Object> args) {
195195
Map<String, Object> result = new HashMap<>();
196196
String plugin = (String) args.get(PLUGIN);
197197
Object pluginObj = loadedPluginCache.get(plugin);
198+
if (pluginObj == null) {
199+
throw new RuntimeException("plugin [" + plugin + "] not found");
200+
}
198201
Map<String, Object> map = (Map<String, Object>) args.get(ARGS);
199202
if (map == null) {
200203
map = new HashMap<>();

noone-core/src/main/java/com/reajason/noone/core/adaptor/NettyHandlerAdaptor.java renamed to noone-core/src/legacy8/java/com/reajason/noone/core/adaptor/NettyHandlerAdaptor.java

File renamed without changes.

noone-core/src/main/java/com/reajason/noone/core/adaptor/ReactorAdaptor.java renamed to noone-core/src/legacy8/java/com/reajason/noone/core/adaptor/ReactorAdaptor.java

File renamed without changes.

noone-core/src/main/java/com/reajason/noone/core/adaptor/ServletAdaptor.java renamed to noone-core/src/legacy8/java/com/reajason/noone/core/adaptor/ServletAdaptor.java

File renamed without changes.

noone-core/src/main/java/com/reajason/noone/core/ConnectionConfig.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

noone-core/src/main/java/com/reajason/noone/core/DotNetConnection.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.reajason.noone.core;
22

3-
3+
import com.reajason.noone.core.client.Client;
44
import com.reajason.noone.core.profile.Profile;
55

66
import java.util.Map;
@@ -11,8 +11,13 @@
1111
*/
1212
public class DotNetConnection extends ShellConnection {
1313

14-
public DotNetConnection(ConnectionConfig config) {
15-
super(config);
14+
public DotNetConnection(Client coreClient, Profile coreProfile) {
15+
super(coreClient, coreProfile);
16+
}
17+
18+
public DotNetConnection(Client coreClient, Profile coreProfile,
19+
Client loaderClient, Profile loaderProfile, String shellType) {
20+
super(coreClient, coreProfile, loaderClient, loaderProfile, shellType);
1621
}
1722

1823
@Override

noone-core/src/main/java/com/reajason/noone/core/JavaConnection.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.reajason.noone.core.adaptor.NettyHandlerAdaptor;
99
import com.reajason.noone.core.adaptor.ReactorAdaptor;
1010
import com.reajason.noone.core.adaptor.ServletAdaptor;
11+
import com.reajason.noone.core.client.Client;
1112
import com.reajason.noone.core.profile.Profile;
1213
import lombok.SneakyThrows;
1314
import net.bytebuddy.ByteBuddy;
@@ -26,8 +27,13 @@
2627
*/
2728
public class JavaConnection extends ShellConnection {
2829

29-
public JavaConnection(ConnectionConfig config) {
30-
super(config);
30+
public JavaConnection(Client coreClient, Profile coreProfile) {
31+
super(coreClient, coreProfile);
32+
}
33+
34+
public JavaConnection(Client coreClient, Profile coreProfile,
35+
Client loaderClient, Profile loaderProfile, String shellType) {
36+
super(coreClient, coreProfile, loaderClient, loaderProfile, shellType);
3137
}
3238

3339
@Override

noone-core/src/main/java/com/reajason/noone/core/NodeJsConnection.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
package com.reajason.noone.core;
22

3-
3+
import com.reajason.noone.core.client.Client;
44
import com.reajason.noone.core.profile.Profile;
55

66
import java.nio.charset.StandardCharsets;
77
import java.util.Map;
88

99
public class NodeJsConnection extends ShellConnection {
1010

11-
public NodeJsConnection(ConnectionConfig config) {
12-
super(config);
11+
public NodeJsConnection(Client coreClient, Profile coreProfile) {
12+
super(coreClient, coreProfile);
13+
}
14+
15+
public NodeJsConnection(Client coreClient, Profile coreProfile,
16+
Client loaderClient, Profile loaderProfile, String shellType) {
17+
super(coreClient, coreProfile, loaderClient, loaderProfile, shellType);
1318
}
1419

1520
@Override

noone-core/src/main/java/com/reajason/noone/core/ProfileVisitorWrapper.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.reajason.noone.core;
22

33
import com.reajason.javaweb.memshell.ShellType;
4+
import com.reajason.noone.core.profile.config.HttpRequestBodyType;
5+
import com.reajason.noone.core.profile.config.HttpResponseBodyType;
46
import com.reajason.noone.core.generator.identifier.NettyHttpIdentifierVisitor;
57
import com.reajason.noone.core.generator.identifier.ReactorIdentifierVisitor;
68
import com.reajason.noone.core.generator.identifier.ServletIdentifierVisitor;

0 commit comments

Comments
 (0)