chore: fix errors in IDE

Author: SteKoe

spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/web/UiController.java

@@ -22,7 +22,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import org.springframework.boot.context.properties.ConstructorBinding;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.http.MediaType;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -87,10 +87,8 @@ public List<UiExtension> getJsExtensions() {
 		return this.uiExtensions.getJsExtensions();
 	}
 
-	// FIXME: add @Nullable to principal parameter
-	// see https://github.com/spring-projects/spring-framework/issues/25981
 	@ModelAttribute(value = "user", binding = false)
-	public Map<String, Object> getUser(Principal principal) {
+	public Map<String, Object> getUser(@Nullable Principal principal) {
 		if (principal != null) {
 			return singletonMap("name", principal.getName());
 		}
@@ -151,7 +149,6 @@ public static class Settings {
 
 	@lombok.Data
 	@JsonInclude(Include.NON_EMPTY)
-	@ConstructorBinding
 	public static class ExternalView {
 
 		/**
@@ -187,7 +184,6 @@ public ExternalView(String label, String url, Integer order, boolean iframe) {
 
 	@lombok.Data
 	@JsonInclude(Include.NON_EMPTY)
-	@ConstructorBinding
 	public static class ViewSettings {
 
 		/**

spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/web/servlet/HomepageForwardingFilter.java

@@ -66,8 +66,7 @@ public HomepageForwardingFilter(HomepageForwardingFilterConfig filterConfig) {
 	@Override
 	public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
 			throws IOException, ServletException {
-		if (request instanceof HttpServletRequest) {
-			HttpServletRequest httpRequest = (HttpServletRequest) request;
+		if (request instanceof HttpServletRequest httpRequest) {
 			if (this.matcher.test(httpRequest)) {
 				log.trace("Forwarding request with URL {} to index", httpRequest.getRequestURI());
 				request.getRequestDispatcher(this.homepage).forward(request, response);

spring-boot-admin-server-ui/src/test/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiPropertiesTest.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2014-2022 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package de.codecentric.boot.admin.server.ui.config;
+
+import java.time.Duration;
+
+import org.assertj.core.api.WithAssertions;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+@SpringBootTest(classes = AdminServerUiProperties.class)
+@ExtendWith(SpringExtension.class)
+@TestPropertySource(properties = {
+	"spring.boot.admin.ui.cache.maxAge: -1s",
+	"spring.boot.admin.ui.cache.noCache: true",
+	"spring.boot.admin.ui.cache.noStore: true",
+	"spring.boot.admin.ui.theme.color: #ffffff",
+	"spring.boot.admin.ui.theme.palette.50: #50",
+	"spring.boot.admin.ui.theme.palette.100: #100",
+	"spring.boot.admin.ui.theme.palette.200: #200",
+	"spring.boot.admin.ui.theme.palette.300: #300",
+	"spring.boot.admin.ui.theme.palette.400: #400",
+	"spring.boot.admin.ui.theme.palette.500: #500",
+	"spring.boot.admin.ui.theme.palette.600: #600",
+	"spring.boot.admin.ui.theme.palette.700: #700",
+	"spring.boot.admin.ui.theme.palette.800: #800",
+	"spring.boot.admin.ui.theme.palette.900: #900"
+})
+@EnableConfigurationProperties({AdminServerUiProperties.class})
+class AdminServerUiPropertiesTest implements WithAssertions {
+
+	@Autowired
+	private AdminServerUiProperties adminServerUiProperties;
+
+	@Nested
+	class CacheTest {
+		@Test
+		void maxAge() {
+			assertThat(adminServerUiProperties.getCache().getMaxAge()).isEqualTo(Duration.ofSeconds(-1));
+		}
+
+		@Test
+		void noCache() {
+			assertThat(adminServerUiProperties.getCache().getNoCache()).isEqualTo(true);
+		}
+
+		@Test
+		void noStore() {
+			assertThat(adminServerUiProperties.getCache().getNoStore()).isEqualTo(true);
+		}
+	}
+
+	@Nested
+	class ThemeTest {
+		@Test
+		void color() {
+			assertThat(adminServerUiProperties.getTheme().getColor()).isEqualTo("#ffffff");
+		}
+
+		@Nested
+		class PaletteTest {
+			@Test
+			void shades() {
+				AdminServerUiProperties.UiTheme theme = adminServerUiProperties.getTheme();
+				AdminServerUiProperties.Palette palette = theme.getPalette();
+
+				assertThat(palette.getShade50()).isEqualTo("#50");
+				assertThat(palette.getShade100()).isEqualTo("#100");
+				assertThat(palette.getShade200()).isEqualTo("#200");
+				assertThat(palette.getShade300()).isEqualTo("#300");
+				assertThat(palette.getShade400()).isEqualTo("#400");
+				assertThat(palette.getShade500()).isEqualTo("#500");
+				assertThat(palette.getShade600()).isEqualTo("#600");
+				assertThat(palette.getShade700()).isEqualTo("#700");
+				assertThat(palette.getShade800()).isEqualTo("#800");
+				assertThat(palette.getShade900()).isEqualTo("#900");
+			}
+		}
+	}
+}