Merge pull request #245 from sentrysoftware/feature/issue-241-missing…

…-skip-null-annotation-on-port-field-leads-to-configuration-issues Issue #241: missing skip null annotation on port field leads to configuration issues
sentrysoftware · Jun 10, 2024 · ab152e3 · ab152e3
2 parents f9f3cb0 + 5a8b2e3
commit ab152e3
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/...tension/src/main/java/org/sentrysoftware/metricshub/extension/ipmi/IpmiConfiguration.java b/...tension/src/main/java/org/sentrysoftware/metricshub/extension/ipmi/IpmiConfiguration.java
@@ -27,6 +27,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Builder.Default;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.sentrysoftware.metricshub.engine.common.exception.InvalidConfigurationException;
@@ -44,7 +45,7 @@
 @NoArgsConstructor
 public class IpmiConfiguration implements IConfiguration {
 
-	@Builder.Default
+	@Default
 	@JsonSetter(nulls = SKIP)
 	@JsonDeserialize(using = TimeDeserializer.class)
 	private final Long timeout = 120L;

diff --git a/...tension/src/main/java/org/sentrysoftware/metricshub/extension/snmp/SnmpConfiguration.java b/...tension/src/main/java/org/sentrysoftware/metricshub/extension/snmp/SnmpConfiguration.java
@@ -50,8 +50,8 @@ public class SnmpConfiguration implements ISnmpConfiguration {
 	private static final String INVALID_SNMP_VERSION_EXCEPTION_MESSAGE = "Invalid SNMP version: ";
 
 	@Default
-	@JsonDeserialize(using = SnmpVersionDeserializer.class)
 	@JsonSetter(nulls = SKIP)
+	@JsonDeserialize(using = SnmpVersionDeserializer.class)
 	private final SnmpVersion version = SnmpVersion.V1;
 
 	@Default

diff --git a/...ion/src/main/java/org/sentrysoftware/metricshub/extension/snmpv3/SnmpV3Configuration.java b/...ion/src/main/java/org/sentrysoftware/metricshub/extension/snmpv3/SnmpV3Configuration.java
@@ -27,6 +27,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Builder.Default;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
@@ -51,15 +52,15 @@ public class SnmpV3Configuration implements ISnmpConfiguration {
 	private static final String INVALID_AUTH_TYPE_EXCEPTION_MESSAGE = "Invalid authentication type: ";
 	private static final String INVALID_PRIVACY_VALUE_EXCEPTION_MESSAGE = "Invalid privacy value: ";
 
-	@Builder.Default
+	@Default
 	@JsonSetter(nulls = SKIP)
 	private char[] community = new char[] { 'p', 'u', 'b', 'l', 'i', 'c' };
 
-	@Builder.Default
+	@Default
 	@JsonSetter(nulls = SKIP)
 	private Integer port = 161;
 
-	@Builder.Default
+	@Default
 	@JsonSetter(nulls = SKIP)
 	@JsonDeserialize(using = TimeDeserializer.class)
 	private Long timeout = 120L;

diff --git a/...tension/src/main/java/org/sentrysoftware/metricshub/extension/wbem/WbemConfiguration.java b/...tension/src/main/java/org/sentrysoftware/metricshub/extension/wbem/WbemConfiguration.java
@@ -21,9 +21,13 @@
  * ╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱╲╱
  */
 
+import static com.fasterxml.jackson.annotation.Nulls.SKIP;
+
+import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
+import lombok.Builder.Default;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.sentrysoftware.metricshub.engine.common.exception.InvalidConfigurationException;
@@ -41,15 +45,18 @@
 @NoArgsConstructor
 public class WbemConfiguration implements IConfiguration {
 
-	@Builder.Default
+	@Default
+	@JsonSetter(nulls = SKIP)
 	private final TransportProtocols protocol = TransportProtocols.HTTPS;
 
-	@Builder.Default
+	@Default
+	@JsonSetter(nulls = SKIP)
 	private final Integer port = 5989;
 
 	private String namespace;
 
-	@Builder.Default
+	@Default
+	@JsonSetter(nulls = SKIP)
 	@JsonDeserialize(using = TimeDeserializer.class)
 	private final Long timeout = 120L;
 

diff --git a/...nsion/src/main/java/org/sentrysoftware/metricshub/extension/winrm/WinRmConfiguration.java b/...nsion/src/main/java/org/sentrysoftware/metricshub/extension/winrm/WinRmConfiguration.java
@@ -55,6 +55,7 @@ public class WinRmConfiguration implements IWinConfiguration {
 	private String namespace;
 
 	@Default
+	@JsonSetter(nulls = SKIP)
 	private Integer port = 5985;
 
 	@Default
@@ -64,6 +65,7 @@ public class WinRmConfiguration implements IWinConfiguration {
 	private List<AuthenticationEnum> authentications;
 
 	@Default
+	@JsonSetter(nulls = SKIP)
 	@JsonDeserialize(using = TimeDeserializer.class)
 	private Long timeout = 120L;