fix: refactor code to eliminate two minor sonar reported bugs (jhipst…

…er#254) Related to jhipster#209
fangjian0423 · Oct 31, 2020 · ef1346e · ef1346e
1 parent c802ece
commit ef1346e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/main/java/io/github/jhipster/online/config/WebConfigurer.java b/src/main/java/io/github/jhipster/online/config/WebConfigurer.java
@@ -28,6 +28,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Paths;
 import java.util.EnumSet;
+import java.util.List;
 import javax.servlet.DispatcherType;
 import javax.servlet.FilterRegistration;
 import javax.servlet.ServletContext;
@@ -150,7 +151,8 @@ private void initCachingHttpHeadersFilter(ServletContext servletContext, EnumSet
     public CorsFilter corsFilter() {
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         CorsConfiguration config = jHipsterProperties.getCors();
-        if (config.getAllowedOrigins() != null && !config.getAllowedOrigins().isEmpty()) {
+        List<String> allowedOrigins = config.getAllowedOrigins();
+        if (allowedOrigins != null && !allowedOrigins.isEmpty()) {
             log.debug("Registering CORS filter");
             source.registerCorsConfiguration("/api/**", config);
             source.registerCorsConfiguration("/management/**", config);

diff --git a/src/main/java/io/github/jhipster/online/web/rest/errors/ExceptionTranslator.java b/src/main/java/io/github/jhipster/online/web/rest/errors/ExceptionTranslator.java
@@ -21,6 +21,7 @@
 
 import io.github.jhipster.web.util.HeaderUtil;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -64,6 +65,12 @@ public ResponseEntity<Problem> process(@Nullable ResponseEntity<Problem> entity,
         if (entity == null) {
             return entity;
         }
+
+        HttpServletRequest nativeRequest = request.getNativeRequest(HttpServletRequest.class);
+        if (nativeRequest == null) {
+            return entity;
+        }
+
         Problem problem = entity.getBody();
         if (!(problem instanceof ConstraintViolationProblem || problem instanceof DefaultProblem)) {
             return entity;
@@ -73,7 +80,7 @@ public ResponseEntity<Problem> process(@Nullable ResponseEntity<Problem> entity,
             .withType(Problem.DEFAULT_TYPE.equals(problem.getType()) ? ErrorConstants.DEFAULT_TYPE : problem.getType())
             .withStatus(problem.getStatus())
             .withTitle(problem.getTitle())
-            .with(PATH_KEY, request.getNativeRequest(HttpServletRequest.class).getRequestURI());
+            .with(PATH_KEY, nativeRequest.getRequestURI());
 
         if (problem instanceof ConstraintViolationProblem) {
             builder