Skip to content

Commit

Permalink
优化代码
Browse files Browse the repository at this point in the history
  • Loading branch information
@smthing
smthing committed Nov 29, 2024
1 parent fa3ea29 commit cd6b159
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions servlet-core/src/main/java/tech/smartboot/servlet/impl/HttpServletRequestImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ public class HttpServletRequestImpl implements SmartHttpServletRequest {
private final InetSocketAddress localAddress;


public HttpServletRequestImpl(HttpRequest request, ServletContextRuntime runtime, CompletableFuture<Object> completableFuture) {
public HttpServletRequestImpl(HttpRequest request, ServletContextRuntime runtime,
CompletableFuture<Object> completableFuture) {
this.request = request;
this.servletContext = runtime.getServletContext();
this.runtime = runtime;
Expand Down Expand Up @@ -350,7 +351,8 @@ private void initPath() {
pathInfo = null;
}
case PATH -> {
servletPath = servletMappingInfo.getUrlPattern().substring(0, servletMappingInfo.getUrlPattern().length() - 2);
servletPath = servletMappingInfo.getUrlPattern().substring(0,
servletMappingInfo.getUrlPattern().length() - 2);
if (getContextPath().length() + servletPath.length() < getRequestURI().length()) {
pathInfo = getRequestURI().substring(getContextPath().length() + servletPath.length());
}
Expand Down Expand Up @@ -405,7 +407,8 @@ public boolean authenticate(HttpServletResponse response) {
public void login(String username, String password) throws ServletException {
SecurityAccount securityAccount = runtime.getSecurityProvider().login(username, password);
if (securityAccount != null) {
setLoginAccount(new LoginAccount(securityAccount.getUsername(), securityAccount.getPassword(), securityAccount.getRoles(), HttpServletRequest.FORM_AUTH));
setLoginAccount(new LoginAccount(securityAccount.getUsername(), securityAccount.getPassword(),
securityAccount.getRoles(), HttpServletRequest.FORM_AUTH));
}
}

Expand Down Expand Up @@ -442,7 +445,8 @@ public HttpServletMapping getHttpServletMapping() {
}
break;
case EXTENSION:
matchValue = getServletPath().substring(getServletPath().charAt(0) == '/' ? 1 : 0, getServletPath().length() - servletMappingInfo.getUrlPattern().length() + 1);
matchValue = getServletPath().substring(getServletPath().charAt(0) == '/' ? 1 : 0,
getServletPath().length() - servletMappingInfo.getUrlPattern().length() + 1);
break;
default:
throw new IllegalStateException();
Expand Down Expand Up @@ -495,7 +499,9 @@ private void parseParts() throws ServletException {
if (!location.isDirectory()) {
throw new IOException("there's no upload-file directory!");
}
MultipartConfig config = new MultipartConfig(location.getAbsolutePath(), multipartConfigElement.getMaxFileSize(), multipartConfigElement.getMaxRequestSize(), multipartConfigElement.getFileSizeThreshold());
MultipartConfig config = new MultipartConfig(location.getAbsolutePath(),
multipartConfigElement.getMaxFileSize(), multipartConfigElement.getMaxRequestSize(),
multipartConfigElement.getFileSizeThreshold());
parts = new ArrayList<>();

Collection<org.smartboot.http.common.multipart.Part> items = request.getParts(config);
Expand Down Expand Up @@ -525,7 +531,8 @@ private File getLocation(MultipartConfigElement multipartConfigElement) {
location = new File(locationStr);
//非绝对路径，则存放于临时目录下
if (!location.isAbsolute()) {
location = new File((File) servletContext.getAttribute(ServletContext.TEMPDIR), locationStr).getAbsoluteFile();
location =
new File((File) servletContext.getAttribute(ServletContext.TEMPDIR), locationStr).getAbsoluteFile();
}
}
if (!location.exists()) {
Expand Down Expand Up @@ -751,7 +758,8 @@ public void setAttribute(String name, Object o) {
ServletRequestAttributeEvent event = new ServletRequestAttributeEvent(servletContext, this, name, o);
runtime.getDeploymentInfo().getRequestAttributeListeners().forEach(request -> request.attributeAdded(event));
} else {
ServletRequestAttributeEvent event = new ServletRequestAttributeEvent(servletContext, this, name, replace);
ServletRequestAttributeEvent event = new ServletRequestAttributeEvent(servletContext, this, name,
replace);
runtime.getDeploymentInfo().getRequestAttributeListeners().forEach(request -> request.attributeReplaced(event));
}
}
Expand Down Expand Up @@ -809,7 +817,8 @@ private String getAddress(InetSocketAddress inetSocketAddress) {
if (inetSocketAddress == null) {
return "";
}
return inetSocketAddress.getAddress() == null ? inetSocketAddress.getHostString() : inetSocketAddress.getAddress().getHostAddress();
return inetSocketAddress.getAddress() == null ? inetSocketAddress.getHostString() :
inetSocketAddress.getAddress().getHostAddress();
}

@Override
Expand Down Expand Up @@ -839,7 +848,8 @@ public AsyncContext startAsync(ServletRequest servletRequest, ServletResponse se
throw new IllegalStateException();
}
asyncStarted = true;
asyncContext = runtime.getAsyncContextProvider().startAsync(this, servletRequest, servletResponse, asyncContext);
asyncContext = runtime.getAsyncContextProvider().startAsync(this, servletRequest, servletResponse,
asyncContext);
return asyncContext;
}

Expand Down Expand Up @@ -924,7 +934,7 @@ public PushBuilder newPushBuilder() {
sessionId = getRequestedSessionId();
}
if (sessionId != null) {
pushBuilder.setHeader(HeaderNameEnum.COOKIE.getName(), "JSESSIONID=" + sessionId);
pushBuilder.addHeader(HeaderNameEnum.COOKIE.getName(), "JSESSIONID=" + sessionId);
}
return new PushBuilder() {
@Override
Expand Down

0 comments on commit cd6b159

Please sign in to comment.