diff --git a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java
index 5724ad6b9e2..933cf0f2329 100644
--- a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java
+++ b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/DefaultApplicationRegistrator.java
@@ -20,9 +20,11 @@
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.LongAdder;
+import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+@Slf4j
public class DefaultApplicationRegistrator implements ApplicationRegistrator {
private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationRegistrator.class);
diff --git a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java
index 139dd66aaac..200d9ed3c0e 100644
--- a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java
+++ b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/ReactiveRegistrationClient.java
@@ -62,4 +62,11 @@ protected void setRequestHeaders(HttpHeaders headers) {
headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
}
+ @Override
+ public String toString() {
+ return "ReactiveRegistrationClient{" +
+ "webclient=" + webclient +
+ ", timeout=" + timeout +
+ '}';
+ }
}
diff --git a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java
index c226f10027b..ebb30b25f46 100644
--- a/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java
+++ b/spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/registration/RegistrationApplicationListener.java
@@ -19,6 +19,7 @@
import java.time.Duration;
import java.util.concurrent.ScheduledFuture;
+import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
@@ -37,6 +38,7 @@
*
* @author Johannes Edmeier
*/
+@Slf4j
public class RegistrationApplicationListener implements InitializingBean, DisposableBean {
private static final Logger LOGGER = LoggerFactory.getLogger(RegistrationApplicationListener.class);
@@ -79,6 +81,18 @@ public void onApplicationReady(ApplicationReadyEvent event) {
}
}
+ @Override
+ public String toString() {
+ return "RegistrationApplicationListener{" +
+ "registrator=" + registrator +
+ ", taskScheduler=" + taskScheduler +
+ ", autoDeregister=" + autoDeregister +
+ ", autoRegister=" + autoRegister +
+ ", registerPeriod=" + registerPeriod +
+ ", scheduledTask=" + scheduledTask +
+ '}';
+ }
+
@EventListener
@Order(Ordered.LOWEST_PRECEDENCE)
public void onClosedContext(ContextClosedEvent event) {
diff --git a/spring-boot-admin-server-ui/src/main/frontend/index.server.html b/spring-boot-admin-server-ui/src/main/frontend/index.server.html
new file mode 100644
index 00000000000..d0d1cdb14cc
--- /dev/null
+++ b/spring-boot-admin-server-ui/src/main/frontend/index.server.html
@@ -0,0 +1,43 @@
+
+
+
+
+
+ Spring Boot Admin
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java b/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java
index 05e4c941d71..8eaa6d2f8eb 100644
--- a/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java
+++ b/spring-boot-admin-server-ui/src/main/java/de/codecentric/boot/admin/server/ui/config/AdminServerUiProperties.java
@@ -19,6 +19,7 @@
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -297,4 +298,30 @@ public void set900(String shade900) {
}
+
+ @Override
+ public String toString() {
+ return "AdminServerUiProperties{" +
+ "resourceLocations=" + Arrays.toString(resourceLocations) +
+ ", extensionResourceLocations=" + Arrays.toString(extensionResourceLocations) +
+ ", templateLocation='" + templateLocation + '\'' +
+ ", loginIcon='" + loginIcon + '\'' +
+ ", favicon='" + favicon + '\'' +
+ ", faviconDanger='" + faviconDanger + '\'' +
+ ", title='" + title + '\'' +
+ ", brand='" + brand + '\'' +
+ ", publicUrl='" + publicUrl + '\'' +
+ ", cacheTemplates=" + cacheTemplates +
+ ", cache=" + cache +
+ ", externalViews=" + externalViews +
+ ", viewSettings=" + viewSettings +
+ ", rememberMeEnabled=" + rememberMeEnabled +
+ ", availableLanguages=" + availableLanguages +
+ ", pollTimer=" + pollTimer +
+ ", additionalRouteExcludes=" + additionalRouteExcludes +
+ ", enableToasts=" + enableToasts +
+ ", hideInstanceUrl=" + hideInstanceUrl +
+ ", theme=" + theme +
+ '}';
+ }
}
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java
index 6272e215a8e..61707f98a99 100644
--- a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java
+++ b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifier.java
@@ -25,6 +25,7 @@
import lombok.Builder;
import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.expression.MapAccessor;
@@ -50,6 +51,7 @@
import static java.util.Collections.singletonList;
+@Slf4j
public class MicrosoftTeamsNotifier extends AbstractStatusChangeNotifier {
private static final Logger LOGGER = LoggerFactory.getLogger(MicrosoftTeamsNotifier.class);
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java
index 9f982e13fcf..37c42683213 100644
--- a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java
+++ b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/IntervalCheck.java
@@ -115,4 +115,18 @@ public void stop() {
}
}
+ @Override
+ public String toString() {
+ return "IntervalCheck{" +
+ "name='" + name + '\'' +
+ ", lastChecked=" + lastChecked +
+ ", checkFn=" + checkFn +
+ ", maxBackoff=" + maxBackoff +
+ ", interval=" + interval +
+ ", minRetention=" + minRetention +
+ ", subscription=" + subscription +
+ ", scheduler=" + scheduler +
+ '}';
+ }
+
}
diff --git a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java
index b2968c677bd..36c9a3c7c3d 100644
--- a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java
+++ b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/utils/jackson/BuildVersionMixinTest.java
@@ -68,4 +68,10 @@ public void verifySerializeWithNestedMapEntryVersion() throws JsonProcessingExce
assertThat(result).isEqualTo("\"1.0.0\"");
}
+ @Test
+ public void verifyDeserializer() throws JSONException, JsonProcessingException {
+ BuildVersion buildVersion = objectMapper.readValue("\"1.0.0\"", BuildVersion.class);
+ assertThat(buildVersion).isEqualTo(BuildVersion.valueOf("1.0.0"));
+ }
+
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 00000000000..761e3e429ff
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.boot.admin.ui.title=My Custom Admin Title