Skip to content

Commit 68aaf62

Browse files
greenlaw110greenlaw110
committed
Simplify SubTypeFinder, fade out SourceCodeScanner
1 parent 9dbbd13 commit 68aaf62

25 files changed

+398
-277
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
<dependency>
210210
<groupId>org.osgl</groupId>
211211
<artifactId>osgl-tool</artifactId>
212-
<version>0.6.0-SNAPSHOT</version>
212+
<version>0.7.0-SNAPSHOT</version>
213213
</dependency>
214214

215215
<dependency>

‎src/main/java/act/app/App.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import act.Act;
44
import act.app.data.BinderManager;
55
import act.app.data.StringValueResolverManager;
6-
import act.app.event.AppEvent;
76
import act.app.event.AppEventId;
87
import act.app.util.AppCrypto;
98
import act.app.util.NamedPort;
109
import act.conf.AppConfLoader;
1110
import act.conf.AppConfig;
12-
import act.controller.ControllerSourceCodeScanner;
1311
import act.controller.bytecode.ControllerByteCodeScanner;
1412
import act.di.DependencyInjector;
1513
import act.di.DiBinder;
@@ -18,22 +16,22 @@
1816
import act.handler.builtin.StaticFileGetter;
1917
import act.job.AppJobManager;
2018
import act.job.bytecode.JobByteCodeScanner;
21-
import act.job.bytecode.JobSourceCodeScanner;
2219
import act.mail.MailerConfigManager;
23-
import act.mail.MailerSourceCodeScanner;
2420
import act.mail.bytecode.MailerByteCodeScanner;
2521
import act.route.RouteTableRouterBuilder;
2622
import act.route.Router;
2723
import act.util.ClassInfoByteCodeScanner;
28-
import act.util.ClassInfoSourceCodeScanner;
2924
import act.util.UploadFileStorageService;
3025
import act.view.ActServerError;
3126
import org.osgl._;
3227
import org.osgl.http.H;
3328
import org.osgl.logging.L;
3429
import org.osgl.logging.Logger;
3530
import org.osgl.storage.IStorageService;
36-
import org.osgl.util.*;
31+
import org.osgl.util.C;
32+
import org.osgl.util.E;
33+
import org.osgl.util.IO;
34+
import org.osgl.util.S;
3735

3836
import java.io.File;
3937
import java.util.EventObject;
@@ -434,13 +432,13 @@ private void loadActScanners() {
434432
}
435433

436434
private void loadBuiltInScanners() {
437-
scannerManager.register(new ClassInfoSourceCodeScanner());
435+
//scannerManager.register(new ClassInfoSourceCodeScanner());
438436
scannerManager.register(new ClassInfoByteCodeScanner());
439-
scannerManager.register(new ControllerSourceCodeScanner());
437+
//scannerManager.register(new ControllerSourceCodeScanner());
440438
scannerManager.register(new ControllerByteCodeScanner());
441-
scannerManager.register(new MailerSourceCodeScanner());
439+
//scannerManager.register(new MailerSourceCodeScanner());
442440
scannerManager.register(new MailerByteCodeScanner());
443-
scannerManager.register(new JobSourceCodeScanner());
441+
//scannerManager.register(new JobSourceCodeScanner());
444442
scannerManager.register(new JobByteCodeScanner());
445443
}
446444

‎src/main/java/act/app/conf/AutoConfigPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ private static class AutoConfigLoader {
5151
AutoConfigLoader(App app, Class<?> autoConfigClass) {
5252
this.app = app;
5353
this.autoConfigClass = autoConfigClass;
54-
this.ns = ((AutoConfig) autoConfigClass.getAnnotation(AutoConfig.class)).value();
54+
this.ns = (autoConfigClass.getAnnotation(AutoConfig.class)).value();
5555
}
5656

5757
void load() {

‎src/main/java/act/app/event/AppEventListener.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
import act.event.ActEventListener;
44

55
public interface AppEventListener<EVENT_TYPE extends AppEvent> extends ActEventListener<EVENT_TYPE> {
6-
String id();
76
}

‎src/main/java/act/boot/spark/SparkApp.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ public static void on(Class<? extends Exception> e, RequestHandler handler) {
165165
if (null == l) {
166166
l = C.newList(handler);
167167
exceptionHandlers.put(e, l);
168-
registeredExceptions = registeredExceptions.append(e).sort();
168+
registeredExceptions = registeredExceptions.append(e).sorted();
169169
} else {
170170
l.add(handler);
171171
}

‎src/main/java/act/conf/AppConfig.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -899,10 +899,7 @@ protected T sessionMapper(SessionMapper sessionMapper) {
899899

900900
public SessionMapper sessionMapper() {
901901
if (null == sessionMapper) {
902-
sessionMapper = get(AppConfigKey.SESSION_MAPPER);
903-
if (null == sessionMapper) {
904-
sessionMapper = new SessionMapper.DefaultSessionMapper();
905-
}
902+
sessionMapper = SessionMapper.DefaultSessionMapper.wrap((SessionMapper)get(AppConfigKey.SESSION_MAPPER));
906903
}
907904
return sessionMapper;
908905
}

‎src/main/java/act/controller/ControllerSourceCodeScanner.java‎

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

‎src/main/java/act/controller/meta/GroupInterceptorMetaInfo.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,10 @@ public void mergeFrom(GroupInterceptorMetaInfo classInterceptors, String actionN
9999
classInterceptors.afterList.each(_F.mergeInto(this.afterList, actionName));
100100
classInterceptors.catchList.each(_F.mergeInto(this.catchList, actionName));
101101
classInterceptors.finallyList.each(_F.mergeInto(this.finallyList, actionName));
102-
beforeList = beforeList.sort();
103-
afterList = afterList.sort();
104-
catchList = catchList.sort();
105-
finallyList = finallyList.sort();
102+
beforeList = beforeList.sorted();
103+
afterList = afterList.sorted();
104+
catchList = catchList.sorted();
105+
finallyList = finallyList.sorted();
106106
}
107107

108108
@Override

‎src/main/java/act/event/ActEventListener.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@
77

88
public interface ActEventListener<EVENT_TYPE extends EventObject> extends EventListener, Destroyable {
99
void on(EVENT_TYPE event) throws Exception;
10+
String id();
1011
}

‎src/main/java/act/event/ActEventListenerBase.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,44 @@
11
package act.event;
22

3+
import act.app.event.AppEventListener;
34
import act.util.DestroyableBase;
5+
import org.osgl.util.S;
46

57
import java.util.EventObject;
68

79
public abstract class ActEventListenerBase<EVENT_TYPE extends EventObject> extends DestroyableBase implements ActEventListener<EVENT_TYPE> {
10+
private String id;
11+
public ActEventListenerBase(CharSequence id) {
12+
if (null == id) {
13+
id = S.uuid();
14+
}
15+
this.id = id.toString();
16+
}
17+
18+
public ActEventListenerBase() {
19+
this(S.uuid());
20+
}
21+
22+
@Override
23+
public String id() {
24+
return id;
25+
}
26+
27+
@Override
28+
public int hashCode() {
29+
return id.hashCode();
30+
}
31+
32+
@Override
33+
public boolean equals(Object obj) {
34+
if (this == obj) {
35+
return true;
36+
}
37+
if (obj instanceof AppEventListener) {
38+
AppEventListener that = (AppEventListener) obj;
39+
return S.eq(that.id(), this.id());
40+
}
41+
return false;
42+
}
843

944
}

0 commit comments

Comments
 (0)