Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue #241: missing skip null annotation on port field leads to configuration issues #245

Merged
merged 3 commits into from
Jun 10, 2024
Merged

Issue #241: missing skip null annotation on port field leads to configuration issues #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
920df9f
Issue #241: Missing Skip Null Annotation on Port Field Leads to Confi…
CherfaElyes Jun 9, 2024
2d4045d
Issue #241: Missing Skip Null Annotation on Port Field Leads to Confi…
CherfaElyes Jun 10, 2024
5a8b2e3
Merge branch 'main' into feature/issue-241-missing-skip-null-annotati…
CherfaElyes Jun 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...tension/src/main/java/org/sentrysoftware/metricshub/extension/ipmi/IpmiConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...tension/src/main/java/org/sentrysoftware/metricshub/extension/snmp/SnmpConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions ...ion/src/main/java/org/sentrysoftware/metricshub/extension/snmpv3/SnmpV3Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
13 changes: 10 additions & 3 deletions ...tension/src/main/java/org/sentrysoftware/metricshub/extension/wbem/WbemConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions ...nsion/src/main/java/org/sentrysoftware/metricshub/extension/winrm/WinRmConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public class WinRmConfiguration implements IWinConfiguration {
private String namespace;

@Default
@JsonSetter(nulls = SKIP)
private Integer port = 5985;

@Default
Expand All @@ -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;

Expand Down