diff --git a/src/main/java/org/ssssssss/magicapi/context/HeaderContext.java b/src/main/java/org/ssssssss/magicapi/context/HeaderContext.java deleted file mode 100644 index dbc23c8b..00000000 --- a/src/main/java/org/ssssssss/magicapi/context/HeaderContext.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.ssssssss.magicapi.context; - -import java.util.HashMap; -import java.util.Map; - -/** - * Header Context 用于脚本中获取Header信息 - */ -public class HeaderContext extends HashMap { - - private final Map headers; - - public HeaderContext(Map headers) { - this.headers = headers; - } - - @Override - public Object get(Object key) { - return headers.get(key); - } -} diff --git a/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java b/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java index e4ab0728..e6519799 100644 --- a/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java +++ b/src/main/java/org/ssssssss/magicapi/controller/RequestHandler.java @@ -21,7 +21,6 @@ import org.ssssssss.magicapi.config.MagicConfiguration; import org.ssssssss.magicapi.config.MappingHandlerMapping; import org.ssssssss.magicapi.config.Valid; import org.ssssssss.magicapi.context.CookieContext; -import org.ssssssss.magicapi.context.HeaderContext; import org.ssssssss.magicapi.context.RequestContext; import org.ssssssss.magicapi.context.SessionContext; import org.ssssssss.magicapi.interceptor.RequestInterceptor; @@ -37,6 +36,7 @@ import org.ssssssss.script.MagicScriptDebugContext; import org.ssssssss.script.exception.MagicScriptAssertException; import org.ssssssss.script.exception.MagicScriptException; import org.ssssssss.script.functions.ObjectConvertExtension; +import org.ssssssss.script.functions.StreamExtension; import org.ssssssss.script.parsing.Span; import org.ssssssss.script.parsing.ast.literal.BooleanLiteral; import org.ssssssss.script.reflection.JavaInvoker; @@ -458,7 +458,7 @@ public class RequestHandler extends MagicController { context.putMapIntoContext(requestEntity.getParameters()); context.putMapIntoContext(requestEntity.getPathVariables()); context.set(VAR_NAME_COOKIE, new CookieContext(requestEntity.getRequest())); - context.set(VAR_NAME_HEADER, new HeaderContext(requestEntity.getHeaders())); + context.set(VAR_NAME_HEADER, requestEntity.getHeaders()); context.set(VAR_NAME_SESSION, new SessionContext(requestEntity.getRequest().getSession())); context.set(VAR_NAME_PATH_VARIABLE, requestEntity.getPathVariables()); Object requestBody = readRequestBody(requestEntity.getRequest());