Add InstanceEvents to Jackson module

This commit adds a Jackson module, which allows for easy (de-)serialization of the InstanceEvents.

fixes #1348

Author: srempfer

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceDeregisteredEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -30,14 +30,16 @@
 @lombok.ToString(callSuper = true)
 public class InstanceDeregisteredEvent extends InstanceEvent {
 
+	public static final String TYPE = "DEREGISTERED";
+
 	private static final long serialVersionUID = 1L;
 
 	public InstanceDeregisteredEvent(InstanceId instance, long version) {
 		this(instance, version, Instant.now());
 	}
 
 	public InstanceDeregisteredEvent(InstanceId instance, long version, Instant timestamp) {
-		super(instance, version, "DEREGISTERED", timestamp);
+		super(instance, version, TYPE, timestamp);
 	}
 
 }

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceEndpointsDetectedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -31,6 +31,8 @@
 @lombok.ToString(callSuper = true)
 public class InstanceEndpointsDetectedEvent extends InstanceEvent {
 
+	public static final String TYPE = "ENDPOINTS_DETECTED";
+
 	private static final long serialVersionUID = 1L;
 
 	private final Endpoints endpoints;
@@ -40,7 +42,7 @@ public InstanceEndpointsDetectedEvent(InstanceId instance, long version, Endpoin
 	}
 
 	public InstanceEndpointsDetectedEvent(InstanceId instance, long version, Instant timestamp, Endpoints endpoints) {
-		super(instance, version, "ENDPOINTS_DETECTED", timestamp);
+		super(instance, version, TYPE, timestamp);
 		this.endpoints = endpoints;
 	}
 

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceInfoChangedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -31,6 +31,8 @@
 @lombok.ToString(callSuper = true)
 public class InstanceInfoChangedEvent extends InstanceEvent {
 
+	public static final String TYPE = "INFO_CHANGED";
+
 	private static final long serialVersionUID = 1L;
 
 	private final Info info;
@@ -40,7 +42,7 @@ public InstanceInfoChangedEvent(InstanceId instance, long version, Info info) {
 	}
 
 	public InstanceInfoChangedEvent(InstanceId instance, long version, Instant timestamp, Info info) {
-		super(instance, version, "INFO_CHANGED", timestamp);
+		super(instance, version, TYPE, timestamp);
 		this.info = info;
 	}
 

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceRegisteredEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -31,6 +31,8 @@
 @lombok.ToString(callSuper = true)
 public class InstanceRegisteredEvent extends InstanceEvent {
 
+	public static final String TYPE = "REGISTERED";
+
 	private static final long serialVersionUID = 1L;
 
 	private final Registration registration;
@@ -40,7 +42,7 @@ public InstanceRegisteredEvent(InstanceId instance, long version, Registration r
 	}
 
 	public InstanceRegisteredEvent(InstanceId instance, long version, Instant timestamp, Registration registration) {
-		super(instance, version, "REGISTERED", timestamp);
+		super(instance, version, TYPE, timestamp);
 		this.registration = registration;
 	}
 

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceRegistrationUpdatedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -31,6 +31,8 @@
 @lombok.ToString(callSuper = true)
 public class InstanceRegistrationUpdatedEvent extends InstanceEvent {
 
+	public static final String TYPE = "REGISTRATION_UPDATED";
+
 	private static final long serialVersionUID = 1L;
 
 	private final Registration registration;
@@ -41,7 +43,7 @@ public InstanceRegistrationUpdatedEvent(InstanceId instance, long version, Regis
 
 	public InstanceRegistrationUpdatedEvent(InstanceId instance, long version, Instant timestamp,
 			Registration registration) {
-		super(instance, version, "REGISTRATION_UPDATED", timestamp);
+		super(instance, version, TYPE, timestamp);
 		this.registration = registration;
 	}
 

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/events/InstanceStatusChangedEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -31,6 +31,8 @@
 @lombok.ToString(callSuper = true)
 public class InstanceStatusChangedEvent extends InstanceEvent {
 
+	public static final String TYPE = "STATUS_CHANGED";
+
 	private static final long serialVersionUID = 1L;
 
 	private final StatusInfo statusInfo;
@@ -40,7 +42,7 @@ public InstanceStatusChangedEvent(InstanceId instance, long version, StatusInfo
 	}
 
 	public InstanceStatusChangedEvent(InstanceId instance, long version, Instant timestamp, StatusInfo statusInfo) {
-		super(instance, version, "STATUS_CHANGED", timestamp);
+		super(instance, version, TYPE, timestamp);
 		this.statusInfo = statusInfo;
 	}
 

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/BuildVersion.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -22,7 +22,6 @@
 
 import javax.annotation.Nullable;
 
-import com.fasterxml.jackson.annotation.JsonValue;
 import org.springframework.util.Assert;
 
 @lombok.Data
@@ -65,7 +64,6 @@ public static BuildVersion from(Map<String, ?> map) {
 		return null;
 	}
 
-	@JsonValue
 	public String getValue() {
 		return this.value;
 	}

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/Info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -23,8 +23,6 @@
 
 import javax.annotation.Nullable;
 
-import com.fasterxml.jackson.annotation.JsonAnyGetter;
-
 /**
  * Represents the info fetched from the info actuator endpoint
  *
@@ -57,7 +55,6 @@ public static Info empty() {
 		return EMPTY;
 	}
 
-	@JsonAnyGetter
 	public Map<String, Object> getValues() {
 		return this.values;
 	}

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/InstanceId.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -18,8 +18,6 @@
 
 import java.io.Serializable;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonValue;
 import org.springframework.util.Assert;
 
 /**
@@ -35,12 +33,10 @@ private InstanceId(String value) {
 		this.value = value;
 	}
 
-	@JsonCreator
 	public static InstanceId of(String value) {
 		return new InstanceId(value);
 	}
 
-	@JsonValue
 	@Override
 	public String toString() {
 		return value;

spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/domain/values/StatusInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2018 the original author or authors.
+ * Copyright 2014-2020 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.
@@ -25,7 +25,6 @@
 
 import javax.annotation.Nullable;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import org.springframework.util.Assert;
 
 import static java.util.Arrays.asList;
@@ -103,22 +102,18 @@ public Map<String, Object> getDetails() {
 		return Collections.unmodifiableMap(details);
 	}
 
-	@JsonIgnore
 	public boolean isUp() {
 		return STATUS_UP.equals(status);
 	}
 
-	@JsonIgnore
 	public boolean isOffline() {
 		return STATUS_OFFLINE.equals(status);
 	}
 
-	@JsonIgnore
 	public boolean isDown() {
 		return STATUS_DOWN.equals(status);
 	}
 
-	@JsonIgnore
 	public boolean isUnknown() {
 		return STATUS_UNKNOWN.equals(status);
 	}