Merge pull request #395 from Frachtwerk/394-revert-changes-to-staticr…

…esourceconfig Revert "107 remove default success controller (#328)"
Frachtwerk · Apr 9, 2024 · c073914 · c073914
2 parents 9984c1e + 96c43b9
commit c073914
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
-## Version `___`
+## Version `2.5.14`
 
+- revert `The FallbackResourceResolver has been removed. URL paths that do not exist are no longer responded to with a DefaultSuccessPage.` 
 - upgraded com.nulab-inc:zxcvbn from 1.8.2 to 1.9.0
 
 ## Version `2.5.13`

diff --git a/essencium-backend-development/pom.xml b/essencium-backend-development/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>de.frachtwerk</groupId>
     <artifactId>essencium-backend-development</artifactId>
-    <version>2.5.13</version>
+    <version>2.5.14</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Essencium-backend-development represents a sample project for development purposes based on Essencium

diff --git a/essencium-backend-identity-model/pom.xml b/essencium-backend-identity-model/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>de.frachtwerk</groupId>
     <artifactId>essencium-backend-identity-model</artifactId>
-    <version>2.5.13</version>
+    <version>2.5.14</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Essencium-backend-identity-model is a software library built on top of Essencium Backend that allows

diff --git a/essencium-backend-sequence-model/pom.xml b/essencium-backend-sequence-model/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>de.frachtwerk</groupId>
     <artifactId>essencium-backend-sequence-model</artifactId>
-    <version>2.5.13</version>
+    <version>2.5.14</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Essencium-backend-sequence-model is a software library built on top of Essencium Backend that allows

diff --git a/essencium-backend-uuid-model/pom.xml b/essencium-backend-uuid-model/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>de.frachtwerk</groupId>
     <artifactId>essencium-backend-uuid-model</artifactId>
-    <version>2.5.13</version>
+    <version>2.5.14</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Essencium-backend-uuid-model is a software library built on top of Essencium Backend that allows

diff --git a/essencium-backend/pom.xml b/essencium-backend/pom.xml
@@ -13,7 +13,7 @@
 
     <groupId>de.frachtwerk</groupId>
     <artifactId>essencium-backend</artifactId>
-    <version>2.5.13</version>
+    <version>2.5.14</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Essencium Backend is a software library built on top of Spring Boot that allows developers to quickly

diff --git a/...end/src/main/java/de/frachtwerk/essencium/backend/configuration/StaticResourceConfig.java b/...end/src/main/java/de/frachtwerk/essencium/backend/configuration/StaticResourceConfig.java
@@ -19,11 +19,17 @@
 
 package de.frachtwerk.essencium.backend.configuration;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.validation.constraints.NotNull;
+import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.web.WebProperties;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.Resource;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import org.springframework.web.servlet.resource.PathResourceResolver;
+import org.springframework.web.servlet.resource.ResourceResolverChain;
 
 @Configuration
 public class StaticResourceConfig implements WebMvcConfigurer {
@@ -40,6 +46,28 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
     registry
         .addResourceHandler("/**")
         .addResourceLocations(resourceProperties.getStaticLocations())
-        .resourceChain(true);
+        .resourceChain(true)
+        .addResolver(new FallbackResourceResolver("index.html"));
+  }
+
+  private static class FallbackResourceResolver extends PathResourceResolver {
+    private final String fallbackPath;
+
+    private FallbackResourceResolver(String fallbackPath) {
+      this.fallbackPath = fallbackPath;
+    }
+
+    @Override
+    public Resource resolveResource(
+        HttpServletRequest request,
+        @NotNull String requestPath,
+        @NotNull List<? extends Resource> locations,
+        @NotNull ResourceResolverChain chain) {
+      final Resource resolvedResource =
+          super.resolveResource(request, requestPath, locations, chain);
+      return resolvedResource != null && resolvedResource.exists()
+          ? resolvedResource
+          : super.resolveResource(request, fallbackPath, locations, chain);
+    }
   }
 }
diff --git a/...werk/essencium/backend/test/integration/controller/StaticResourcesAndRedirectionTest.java b/...werk/essencium/backend/test/integration/controller/StaticResourcesAndRedirectionTest.java
@@ -69,10 +69,7 @@ void testGetExistingStatic() throws Exception {
   void testRedirectNonExistingStatic() throws Exception {
     mockMvc
         .perform(get("/nonexisting"))
-        .andExpect(content().contentType(MediaType.APPLICATION_PROBLEM_JSON))
-        .andExpect(
-            content()
-                .string(
-                    "{\"type\":\"about:blank\",\"title\":\"Not Found\",\"status\":404,\"detail\":\"No static resource nonexisting.\",\"instance\":\"/nonexisting\"}"));
+        .andExpect(content().contentType(MediaType.TEXT_HTML))
+        .andExpect(content().string(INDEX_TEXT));
   }
 }