apply lombook constractor instead of autowired

Author: gy2006

core/src/main/java/com/flowci/core/auth/controller/WebAuth.java

@@ -25,6 +25,7 @@
 import com.flowci.exception.AuthenticationException;
 import com.flowci.util.StringHelper;
 import com.google.common.base.Strings;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.MessageHeaders;
 import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
@@ -43,17 +44,16 @@
  * @author yang
  */
 @Component("webAuth")
+@AllArgsConstructor
 public class WebAuth implements HandlerInterceptor {
 
  private static final String HeaderToken = "Token";
 
  private static final String ParameterToken = "token";
 
- @Autowired
- private AuthService authService;
+ private final AuthService authService;
 
- @Autowired
- private SessionManager sessionManager;
+ private final SessionManager sessionManager;
 
  /**
  * Get user object from ws message header
@@ -73,7 +73,7 @@ public User validate(MessageHeaders headers) {
  }
 
  Optional<User> user = authService.get(token);
- if (!user.isPresent()) {
+ if (user.isEmpty()) {
  throw new AuthenticationException("Invalid token");
  }
 

core/src/main/java/com/flowci/core/common/adviser/CorsFilter.java

@@ -16,13 +16,12 @@
 
 package com.flowci.core.common.adviser;
 
+import org.springframework.web.bind.annotation.RequestMethod;
+
 import javax.servlet.*;
 import javax.servlet.annotation.WebFilter;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.HandlerInterceptor;
-
 import java.io.IOException;
 
 /**
@@ -34,6 +33,8 @@ public class CorsFilter implements Filter {
  private static final String AllowedHeaders =
  "Origin, X-Requested-With, Content-Disposition, Content-Type, Accept, Token, Authorization";
 
+ private static final String AllowedMethods = "GET, POST, PATCH, OPTIONS, DELETE";
+
  @Override
  public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
  if (!isHttpRequest(request, response)) {
@@ -45,10 +46,10 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
  var httpResponse = (HttpServletResponse) response;
 
  httpResponse.setHeader("Access-Control-Allow-Origin", "*");
- httpResponse.setHeader("Access-Control-Allow-Methods", "GET, POST, PATCH, OPTIONS, DELETE");
+ httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
+ httpResponse.setHeader("Access-Control-Allow-Methods", AllowedMethods);
  httpResponse.setHeader("Access-Control-Max-Age", "1800");
  httpResponse.setHeader("Access-Control-Allow-Headers", AllowedHeaders);
- httpResponse.setHeader("Access-Control-Expose-Headers", AllowedHeaders);
 
  if (httpRequest.getMethod().equals(RequestMethod.OPTIONS.name())) {
  httpResponse.setStatus(HttpServletResponse.SC_OK);

core/src/main/java/com/flowci/core/common/config/WebConfig.java

@@ -22,6 +22,7 @@
 import com.flowci.core.plugin.domain.Plugin;
 import com.flowci.domain.Vars;
 import com.google.common.collect.ImmutableList;
+import lombok.AllArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
@@ -35,10 +36,7 @@
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.http.converter.support.AllEncompassingFormHttpMessageConverter;
 import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.config.annotation.*;
 
 import javax.servlet.Filter;
 import java.nio.file.Path;
@@ -48,16 +46,14 @@
 
 @EnableWebMvc
 @Configuration
+@AllArgsConstructor
 public class WebConfig {
 
- @Autowired
- private HandlerInterceptor apiAuth;
+ private final HandlerInterceptor apiAuth;
 
- @Autowired
- private HandlerInterceptor webAuth;
+ private final HandlerInterceptor webAuth;
 
- @Autowired
- private AppProperties appProperties;
+ private final AppProperties appProperties;
 
  @Bean("staticResourceDir")
  public Path staticResourceDir() {