diff --git a/.gitignore b/.gitignore index d7727ef55..ef6cbdf08 100644 --- a/.gitignore +++ b/.gitignore @@ -58,6 +58,9 @@ classpath-data.json # local Spring configs application-local.properties +application-local.yaml +application-local-*.properties +application-local-*.yaml # Maven maven.properties diff --git a/hawkbit-ddi/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java b/hawkbit-ddi/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java index e0191d58a..2eedb5e0d 100644 --- a/hawkbit-ddi/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java +++ b/hawkbit-ddi/hawkbit-ddi-server/src/main/java/org/eclipse/hawkbit/app/ddi/DDIStart.java @@ -13,7 +13,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.view.RedirectView; /** @@ -36,10 +35,7 @@ public class DDIStart { public static class RedirectController { @GetMapping("/") - public RedirectView redirectToSwagger( - RedirectAttributes attributes) { - attributes.addFlashAttribute("flashAttribute", "redirectWithRedirectView"); - attributes.addAttribute("attribute", "redirectWithRedirectView"); + public RedirectView redirectToSwagger() { return new RedirectView("swagger-ui/index.html"); } } diff --git a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java index 0927b87ea..eba86540b 100644 --- a/hawkbit-mgmt/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java +++ b/hawkbit-mgmt/hawkbit-mgmt-server/src/main/java/org/eclipse/hawkbit/app/mgmt/MgmtServerStart.java @@ -13,7 +13,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.view.RedirectView; /** @@ -36,10 +35,7 @@ public class MgmtServerStart { public static class RedirectController { @GetMapping("/") - public RedirectView redirectToSwagger( - RedirectAttributes attributes) { - attributes.addFlashAttribute("flashAttribute", "redirectWithRedirectView"); - attributes.addAttribute("attribute", "redirectWithRedirectView"); + public RedirectView redirectToSwagger() { return new RedirectView("swagger-ui/index.html"); } } diff --git a/hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java b/hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java index f9e3d374c..d057359d8 100644 --- a/hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java +++ b/hawkbit-monolith/hawkbit-update-server/src/main/java/org/eclipse/hawkbit/app/Start.java @@ -13,7 +13,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.view.RedirectView; /** @@ -40,9 +39,7 @@ public class Start { public static class RedirectController { @GetMapping("/") - public RedirectView redirectToSwagger(final RedirectAttributes attributes) { - attributes.addFlashAttribute("flashAttribute", "redirectWithRedirectView"); - attributes.addAttribute("attribute", "redirectWithRedirectView"); + public RedirectView redirectToSwagger() { return new RedirectView("swagger-ui/index.html"); } }