chore: minor clean ups (#4523)

mirogaudi · Andrey Strukov · ulischulte · web-flow · commit 33c52b38222a · 2025-08-04T09:21:34.000+02:00
Co-authored-by: Andrey Strukov &lt;andrey.strukov@codecentric.de&gt;
Co-authored-by: ulrichschulte &lt;ulrich.schulte@codecentric.de&gt;
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceDeregisteredEvent.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceDeregisteredEvent.java
@@ -26,7 +26,7 @@
  *
  * @author Johannes Edmeier
  */
-@lombok.Data
+@lombok.Value
 @lombok.EqualsAndHashCode(callSuper = true)
 @lombok.ToString(callSuper = true)
 public class InstanceDeregisteredEvent extends InstanceEvent {
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceEndpointsDetectedEvent.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceEndpointsDetectedEvent.java
@@ -27,7 +27,7 @@
  *
  * @author Johannes Edmeier
  */
-@lombok.Data
+@lombok.Value
 @lombok.EqualsAndHashCode(callSuper = true)
 @lombok.ToString(callSuper = true)
 public class InstanceEndpointsDetectedEvent extends InstanceEvent {
@@ -37,7 +37,7 @@ public class InstanceEndpointsDetectedEvent extends InstanceEvent {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	private final Endpoints endpoints;
+	Endpoints endpoints;
 
 	public InstanceEndpointsDetectedEvent(InstanceId instance, long version, Endpoints endpoints) {
 		this(instance, version, Instant.now(), endpoints);
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceInfoChangedEvent.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceInfoChangedEvent.java
@@ -27,7 +27,7 @@
  *
  * @author Johannes Edmeier
  */
-@lombok.Data
+@lombok.Value
 @lombok.EqualsAndHashCode(callSuper = true)
 @lombok.ToString(callSuper = true)
 public class InstanceInfoChangedEvent extends InstanceEvent {
@@ -37,7 +37,7 @@ public class InstanceInfoChangedEvent extends InstanceEvent {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	private final Info info;
+	Info info;
 
 	public InstanceInfoChangedEvent(InstanceId instance, long version, Info info) {
 		this(instance, version, Instant.now(), info);
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceRegisteredEvent.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceRegisteredEvent.java
@@ -27,7 +27,7 @@
  *
  * @author Johannes Edmeier
  */
-@lombok.Data
+@lombok.Value
 @lombok.EqualsAndHashCode(callSuper = true)
 @lombok.ToString(callSuper = true)
 public class InstanceRegisteredEvent extends InstanceEvent {
@@ -37,7 +37,7 @@ public class InstanceRegisteredEvent extends InstanceEvent {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	private final Registration registration;
+	Registration registration;
 
 	public InstanceRegisteredEvent(InstanceId instance, long version, Registration registration) {
 		this(instance, version, Instant.now(), registration);
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceRegistrationUpdatedEvent.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceRegistrationUpdatedEvent.java
@@ -27,7 +27,7 @@
  *
  * @author Johannes Edmeier
  */
-@lombok.Data
+@lombok.Value
 @lombok.EqualsAndHashCode(callSuper = true)
 @lombok.ToString(callSuper = true)
 public class InstanceRegistrationUpdatedEvent extends InstanceEvent {
@@ -37,7 +37,7 @@ public class InstanceRegistrationUpdatedEvent extends InstanceEvent {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	private final Registration registration;
+	Registration registration;
 
 	public InstanceRegistrationUpdatedEvent(InstanceId instance, long version, Registration registration) {
 		this(instance, version, Instant.now(), registration);
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceStatusChangedEvent.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceStatusChangedEvent.java
@@ -27,7 +27,7 @@
  *
  * @author Johannes Edmeier
  */
-@lombok.Data
+@lombok.Value
 @lombok.EqualsAndHashCode(callSuper = true)
 @lombok.ToString(callSuper = true)
 public class InstanceStatusChangedEvent extends InstanceEvent {
@@ -37,7 +37,7 @@ public class InstanceStatusChangedEvent extends InstanceEvent {
 	@Serial
 	private static final long serialVersionUID = 1L;
 
-	private final StatusInfo statusInfo;
+	StatusInfo statusInfo;
 
 	public InstanceStatusChangedEvent(InstanceId instance, long version, StatusInfo statusInfo) {
 		this(instance, version, Instant.now(), statusInfo);
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/BuildVersion.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/BuildVersion.java
@@ -69,10 +69,6 @@ public static BuildVersion from(Map<String, ?> map) {
 		return null;
 	}
 
-	public String getValue() {
-		return this.value;
-	}
-
 	@Override
 	public String toString() {
 		return this.value;
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Endpoints.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Endpoints.java
@@ -86,13 +86,7 @@ public Stream<Endpoint> stream() {
 		return this.endpoints.values().stream();
 	}
 
-	private static final class UnmodifiableIterator<T> implements Iterator<T> {
-
-		private final Iterator<T> delegate;
-
-		private UnmodifiableIterator(Iterator<T> delegate) {
-			this.delegate = delegate;
-		}
+	private record UnmodifiableIterator<T>(Iterator<T> delegate) implements Iterator<T> {
 
 		@Override
 		public boolean hasNext() {
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Info.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Info.java
@@ -55,8 +55,4 @@ public static Info empty() {
 		return EMPTY;
 	}
 
-	public Map<String, Object> getValues() {
-		return this.values;
-	}
-
 }
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Registration.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Registration.java
@@ -67,7 +67,11 @@ private Registration(String name, @Nullable String managementUrl, String healthU
 		this.serviceUrl = serviceUrl;
 		this.source = source;
 		this.metadata = new LinkedHashMap<>();
-		metadata.forEach(this.metadata::put);
+		for (Map.Entry<String, String> entry : metadata.entrySet()) {
+			String key = entry.getKey();
+			String value = entry.getValue();
+			this.metadata.put(key, value);
+		}
 	}
 
 	public static Registration.Builder create(String name, String healthUrl) {
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Tags.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Tags.java
@@ -24,11 +24,13 @@
 import java.util.function.Function;
 import java.util.stream.Collector;
 
+import lombok.Getter;
 import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
 import static java.util.stream.Collectors.toMap;
 
+@Getter
 @lombok.EqualsAndHashCode
 @lombok.ToString
 public final class Tags implements Serializable {
@@ -46,10 +48,6 @@ private Tags(Map<String, String> tags) {
 		}
 	}
 
-	public Map<String, String> getValues() {
-		return this.values;
-	}
-
 	public Tags append(Tags other) {
 		Map<String, String> newTags = new LinkedHashMap<>(this.values);
 		newTags.putAll(other.values);
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
@@ -25,8 +25,8 @@
 
 import lombok.Builder;
 import lombok.Data;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import lombok.Getter;
+import lombok.Setter;
 import org.springframework.context.expression.MapAccessor;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
@@ -52,8 +52,6 @@
 
 public class MicrosoftTeamsNotifier extends AbstractStatusChangeNotifier {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MicrosoftTeamsNotifier.class);
-
 	private static final String STATUS_KEY = "Status";
 
 	private static final String SERVICE_URL_KEY = "Service URL";
@@ -74,11 +72,12 @@ public class MicrosoftTeamsNotifier extends AbstractStatusChangeNotifier {
 
 	private final SpelExpressionParser parser = new SpelExpressionParser();
 
+	@Setter
 	private RestTemplate restTemplate;
 
 	/**
 	 * Webhook url for Microsoft Teams Channel Webhook connector (i.e.
-	 * https://outlook.office.com/webhook/{webhook-id})
+	 * <a href="https://outlook.office.com/webhook/">...</a>{webhook-id})
 	 */
 	@Nullable
 	private URI webhookUrl;
@@ -110,21 +109,29 @@ public class MicrosoftTeamsNotifier extends AbstractStatusChangeNotifier {
 	/**
 	 * Title of the Teams message when an app de-registers
 	 */
+	@Setter
+	@Getter
 	private String deRegisteredTitle = "De-Registered";
 
 	/**
 	 * Title of the Teams message when an app registers
 	 */
+	@Setter
+	@Getter
 	private String registeredTitle = "Registered";
 
 	/**
 	 * Title of the Teams message when an app changes status
 	 */
+	@Setter
+	@Getter
 	private String statusChangedTitle = "Status Changed";
 
 	/**
 	 * Summary section of every Teams message originating from Spring Boot Admin
 	 */
+	@Setter
+	@Getter
 	private String messageSummary = "Spring Boot Admin Notification";
 
 	public MicrosoftTeamsNotifier(InstanceRepository repository, RestTemplate restTemplate) {
@@ -269,42 +276,6 @@ public void setStatusActivitySubtitle(String statusActivitySubtitle) {
 		this.statusActivitySubtitle = parser.parseExpression(statusActivitySubtitle, ParserContext.TEMPLATE_EXPRESSION);
 	}
 
-	public String getDeRegisteredTitle() {
-		return deRegisteredTitle;
-	}
-
-	public void setDeRegisteredTitle(String deRegisteredTitle) {
-		this.deRegisteredTitle = deRegisteredTitle;
-	}
-
-	public String getRegisteredTitle() {
-		return registeredTitle;
-	}
-
-	public void setRegisteredTitle(String registeredTitle) {
-		this.registeredTitle = registeredTitle;
-	}
-
-	public String getStatusChangedTitle() {
-		return statusChangedTitle;
-	}
-
-	public void setStatusChangedTitle(String statusChangedTitle) {
-		this.statusChangedTitle = statusChangedTitle;
-	}
-
-	public String getMessageSummary() {
-		return messageSummary;
-	}
-
-	public void setMessageSummary(String messageSummary) {
-		this.messageSummary = messageSummary;
-	}
-
-	public void setRestTemplate(RestTemplate restTemplate) {
-		this.restTemplate = restTemplate;
-	}
-
 	@Data
 	@Builder
 	public static class Message {
@@ -333,14 +304,7 @@ public static class Section {
 
 	}
 
-	@Data
-	public static class Fact {
-
-		private final String name;
-
-		@Nullable
-		private final String value;
-
+	public record Fact(String name, @Nullable String value) {
 	}
 
 }
diff --git a/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/endpoints/ProbeEndpointsStrategy.java b/spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/endpoints/ProbeEndpointsStrategy.java
@@ -22,7 +22,6 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import lombok.Data;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.Assert;
@@ -69,9 +68,10 @@ public Mono<Endpoints> detectEndpoints(Instance instance) {
 	}
 
 	protected Mono<DetectedEndpoint> detectEndpoint(Instance instance, EndpointDefinition endpoint) {
+		Assert.notNull(instance.getRegistration().getManagementUrl(), "managementUrl must not be null");
 		URI uri = UriComponentsBuilder.fromUriString(instance.getRegistration().getManagementUrl())
 			.path("/")
-			.path(endpoint.getPath())
+			.path(endpoint.path())
 			.build()
 			.toUri();
 		return this.instanceWebClient.instance(instance)
@@ -108,37 +108,27 @@ protected Mono<Endpoints> convert(List<DetectedEndpoint> endpoints) {
 		}
 
 		Map<String, List<DetectedEndpoint>> endpointsById = endpoints.stream()
-			.collect(groupingBy((e) -> e.getDefinition().getId()));
+			.collect(groupingBy((e) -> e.definition().id()));
 		List<Endpoint> result = endpointsById.values().stream().map((endpointList) -> {
-			endpointList.sort(comparingInt((e) -> this.endpoints.indexOf(e.getDefinition())));
+			endpointList.sort(comparingInt((e) -> this.endpoints.indexOf(e.definition())));
 			if (endpointList.size() > 1) {
 				log.warn("Duplicate endpoints for id '{}' detected. Omitting: {}",
-						endpointList.get(0).getDefinition().getId(), endpointList.subList(1, endpointList.size()));
+						endpointList.get(0).definition().id(), endpointList.subList(1, endpointList.size()));
 			}
-			return endpointList.get(0).getEndpoint();
+			return endpointList.get(0).endpoint();
 		}).toList();
 		return Mono.just(Endpoints.of(result));
 	}
 
-	@Data
-	protected static class DetectedEndpoint {
-
-		private final EndpointDefinition definition;
-
-		private final Endpoint endpoint;
+	protected record DetectedEndpoint(EndpointDefinition definition, Endpoint endpoint) {
 
 		private static DetectedEndpoint of(EndpointDefinition endpointDefinition, String url) {
-			return new DetectedEndpoint(endpointDefinition, Endpoint.of(endpointDefinition.getId(), url));
+			return new DetectedEndpoint(endpointDefinition, Endpoint.of(endpointDefinition.id(), url));
 		}
 
 	}
 
-	@Data
-	protected static class EndpointDefinition {
-
-		private final String id;
-
-		private final String path;
+	protected record EndpointDefinition(String id, String path) {
 
 		private static EndpointDefinition create(String idWithPath) {
 			int idxDelimiter = idWithPath.indexOf(':');
diff --git a/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifierTest.java b/spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/notify/MicrosoftTeamsNotifierTest.java
@@ -232,20 +232,20 @@ private void assertMessage(Message message, String expectedTitle, String expecte
 			assertThat(section.getActivitySubtitle()).isEqualTo(expectedSubTitle);
 
 			assertThat(section.getFacts()).hasSize(5).anySatisfy((fact) -> {
-				assertThat(fact.getName()).isEqualTo("Status");
-				assertThat(fact.getValue()).isEqualTo("UNKNOWN");
+				assertThat(fact.name()).isEqualTo("Status");
+				assertThat(fact.value()).isEqualTo("UNKNOWN");
 			}).anySatisfy((fact) -> {
-				assertThat(fact.getName()).isEqualTo("Service URL");
-				assertThat(fact.getValue()).isEqualTo(SERVICE_URL);
+				assertThat(fact.name()).isEqualTo("Service URL");
+				assertThat(fact.value()).isEqualTo(SERVICE_URL);
 			}).anySatisfy((fact) -> {
-				assertThat(fact.getName()).isEqualTo("Health URL");
-				assertThat(fact.getValue()).isEqualTo(HEALTH_URL);
+				assertThat(fact.name()).isEqualTo("Health URL");
+				assertThat(fact.value()).isEqualTo(HEALTH_URL);
 			}).anySatisfy((fact) -> {
-				assertThat(fact.getName()).isEqualTo("Management URL");
-				assertThat(fact.getValue()).isEqualTo(MANAGEMENT_URL);
+				assertThat(fact.name()).isEqualTo("Management URL");
+				assertThat(fact.value()).isEqualTo(MANAGEMENT_URL);
 			}).anySatisfy((fact) -> {
-				assertThat(fact.getName()).isEqualTo("Source");
-				assertThat(fact.getValue()).isNull();
+				assertThat(fact.name()).isEqualTo("Source");
+				assertThat(fact.value()).isNull();
 			});
 		});
 	}

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Johannes Edmeier`
`28`	`28`	`*/`
`29`		`-@lombok.Data`
	`29`	`+@lombok.Value`
`30`	`30`	`@lombok.EqualsAndHashCode(callSuper = true)`
`31`	`31`	`@lombok.ToString(callSuper = true)`
`32`	`32`	`public class InstanceDeregisteredEvent extends InstanceEvent {`
Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,4 @@ public static Info empty() {`
`55`	`55`	`return EMPTY;`
`56`	`56`	`}`
`57`	`57`
`58`		`- public Map<String, Object> getValues() {`
`59`		`- return this.values;`
`60`		`- }`
`61`		`-`
`62`	`58`	`}`