fixed redirect issue

5d4dc120 · Sascha Herzinger · 2410790a · 5d4dc120 · 2410790a · 5d4dc120
Commit 5d4dc120 authored Jul 15, 2019 by Sascha Herzinger
3 changed files
--- a/web/src/main/java/lcsb/mapviewer/web/config/SpringWebConfig.java
+++ b/web/src/main/java/lcsb/mapviewer/web/config/SpringWebConfig.java
@@ -2,11 +2,14 @@ package lcsb.mapviewer.web.config;

 import lcsb.mapviewer.api.SpringRestApiConfig;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ViewResolver;
 import org.springframework.web.servlet.config.annotation.*;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;

 import java.util.List;

@@ -23,14 +26,26 @@ public class SpringWebConfig implements WebMvcConfigurer {
    this.interceptors = interceptors;
  }

+  @Bean
+  public ViewResolver viewResolver() {
+    InternalResourceViewResolver resolver = new InternalResourceViewResolver();
+    resolver.setPrefix("/");
+    resolver.setSuffix(".xhtml");
+    return resolver;
+  }
+
  @Override
  public void addViewControllers(ViewControllerRegistry registry) {
-    registry.addRedirectViewController("/", "/index.xhtml");
+    registry
+        .addViewController("/")
+        .setViewName("index");
  }

  @Override
  public void addResourceHandlers(ResourceHandlerRegistry registry) {
-    registry.addResourceHandler("/resources/**").addResourceLocations("/resources/");
+    registry
+        .addResourceHandler("/resources/**")
+        .addResourceLocations("/resources/");
  }

  @Override

--- a/web/src/main/webapp/index.html
+++ b/web/src/main/webapp/index.html
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta http-equiv="refresh" content="0; url=index.xhtml" />
-    <p><a href="index.xhtml">Redirect</a></p>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
--- a/web/src/test/java/lcsb/mapviewer/web/SpringSecurityGeneralIntegrationTest.java
+++ b/web/src/test/java/lcsb/mapviewer/web/SpringSecurityGeneralIntegrationTest.java
@@ -135,7 +135,7 @@ public class SpringSecurityGeneralIntegrationTest extends ControllerIntegrationT
  public void testAllowCacheForRootReuqest() throws Exception {
    RequestBuilder request = get("/");
    MockHttpServletResponse response = mockMvc.perform(request)
-        .andExpect(status().is3xxRedirection())
+        .andExpect(status().is2xxSuccessful())
        .andReturn().getResponse();
    assertFalse(response.getHeaderNames().contains("Pragma"));
    assertFalse(response.getHeaderNames().contains("Vary"));