Skip to content

Commit 89bb96f

Browse files
committed
typo
1 parent 70b250d commit 89bb96f

5 files changed

Lines changed: 26 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
public class ActionContext extends ActContext.Base<ActionContext> implements ActContext<ActionContext>, Destroyable {
3737

3838
public static final String ATTR_HANDLER = "__act_handler__";
39-
public static final String ATTR_PATH_VAR_CNT = "__path_var_cnt__";
39+
public static final String ATTR_PATH_VARS = "__path_vars__";
4040
public static final String ATTR_RESULT = "__result__";
4141
public static final String ATTR_EXCEPTION = "__exception__";
4242
public static final String REQ_BODY = "_body";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class DbServiceManager extends AppServiceBase<DbServiceManager> implement
3838
private Map<Class<?>, Dao> modelDaoMap = C.newMap();
3939

4040
protected DbServiceManager(final App app) {
41-
super(app, true);
41+
super(app);
4242
initServices(app.config());
4343
configureSequenceGenerator(app);
4444
app.eventBus().bind(AppEventId.SINGLETON_PROVISIONED, new AppEventListenerBase() {

‎src/main/java/act/handler/builtin/controller/impl/ReflectedHandlerInvoker.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public class ReflectedHandlerInvoker<M extends HandlerMethodMetaInfo> extends De
5757
private String singleJsonFieldName;
5858
private final boolean sessionFree;
5959
private List<BeanSpec> paramSpecs;
60+
private Set<String> pathVariables;
6061

6162
private ReflectedHandlerInvoker(M handlerMetaInfo, App app) {
6263
this.cl = app.classLoader();
@@ -166,8 +167,14 @@ private int fieldsAndParamsCount(ActionContext context) {
166167
if (fieldsAndParamsCount < 2) {
167168
return fieldsAndParamsCount;
168169
}
169-
int pathVarCnt = context.attribute(ActionContext.ATTR_PATH_VAR_CNT);
170-
return fieldsAndParamsCount - pathVarCnt;
170+
return fieldsAndParamsCount - pathVariables(context).size();
171+
}
172+
173+
private Set<String> pathVariables(ActionContext context) {
174+
if (null == pathVariables) {
175+
pathVariables = context.attribute(ActionContext.ATTR_PATH_VARS);
176+
}
177+
return pathVariables;
171178
}
172179

173180
private String singleJsonFieldName(ActionContext context) {

‎src/main/java/act/inject/param/JsonParamValueLoader.java‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package act.inject.param;
22

3+
import act.app.ActionContext;
34
import act.app.App;
45
import act.app.data.StringValueResolverManager;
56
import act.inject.DependencyInjector;
@@ -11,6 +12,7 @@
1112
import java.lang.reflect.Array;
1213
import java.util.Collection;
1314
import java.util.Map;
15+
import java.util.Set;
1416

1517
class JsonParamValueLoader implements ParamValueLoader {
1618

@@ -25,15 +27,24 @@ public Object get() {
2527
private ParamValueLoader fallBack;
2628
private BeanSpec spec;
2729
private Provider defValProvider;
30+
private boolean isPathVariable;
2831

2932
JsonParamValueLoader(ParamValueLoader fallBack, BeanSpec spec, DependencyInjector<?> injector) {
3033
this.fallBack = $.notNull(fallBack);
3134
this.spec = $.notNull(spec);
3235
this.defValProvider = findDefValProvider(spec, injector);
36+
ActionContext ctx = ActionContext.current();
37+
if (null != ctx) {
38+
Set<String> pathVariables = ctx.attribute(ActionContext.ATTR_PATH_VARS);
39+
isPathVariable = pathVariables.contains(spec.name());
40+
}
3341
}
3442

3543
@Override
3644
public Object load(Object bean, ActContext<?> context, boolean noDefaultValue) {
45+
if (isPathVariable) {
46+
return fallBack.load(bean, context, noDefaultValue);
47+
}
3748
JsonDTO dto = context.attribute(KEY_JSON_DTO);
3849
if (null == dto) {
3950
return this.fallBack.load(bean, context, noDefaultValue);

‎src/main/java/act/route/Router.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,20 +719,21 @@ public Class<? extends Annotation> scope() {
719719
}
720720

721721
private static class ContextualHandler extends DelegateRequestHandler {
722-
private int pathVarCnt;
722+
private Set<String> pathVariables;
723723
protected ContextualHandler(RequestHandlerBase next, Node node) {
724724
super(next);
725+
pathVariables = new HashSet<>();
725726
while (node != null) {
726727
if (node.isDynamic()) {
727-
pathVarCnt++;
728+
pathVariables.add(node.varName.toString());
728729
}
729730
node = node.parent;
730731
}
731732
}
732733
@Override
733734
public void handle(ActionContext context) {
734735
context.attribute(ActionContext.ATTR_HANDLER, realHandler());
735-
context.attribute(ActionContext.ATTR_PATH_VAR_CNT, pathVarCnt);
736+
context.attribute(ActionContext.ATTR_PATH_VARS, pathVariables);
736737
context.resolve();
737738
super.handle(context);
738739
}

0 commit comments

Comments
 (0)