Skip to content

Commit 7b22d81

Browse files
committed
Set jmx-enabled false in VaultTest
1 parent 779d047 commit 7b22d81

File tree

1 file changed

+36
-22
lines changed

1 file changed

+36
-22
lines changed

config/src/main/java/io/scalecube/config/audit/Slf4JConfigEventListener.java

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public void onEvents(Collection<ConfigEvent> events) {
1919
.forEach(
2020
event -> {
2121
sb.append("\n");
22-
sb.append(event.getName()).append("=");
22+
sb.append(event.getName()).append("=[");
2323
sb.append(propValueAsString(event));
24-
sb.append(",\t");
24+
sb.append("], ");
2525
sb.append("source=");
2626
sb.append(sourceAsString(event));
27-
sb.append(",\t");
27+
sb.append(", ");
2828
sb.append("origin=");
2929
sb.append(originAsString(event));
3030
});
@@ -33,31 +33,45 @@ public void onEvents(Collection<ConfigEvent> events) {
3333
}
3434
}
3535

36-
private String originAsString(ConfigEvent event) {
37-
if (Objects.equals(event.getOldOrigin(), event.getNewOrigin())) {
38-
return event.getNewOrigin();
39-
} else {
40-
return event.getOldOrigin() + "->" + event.getNewOrigin();
36+
private static String originAsString(ConfigEvent event) {
37+
final String oldValue = event.getOldOrigin();
38+
final String newValue = event.getNewOrigin();
39+
40+
if (Objects.equals(oldValue, newValue)) {
41+
return newValue;
4142
}
43+
return (oldValue == null || oldValue.isEmpty()) ? newValue : oldValue + "->" + newValue;
4244
}
4345

44-
private String sourceAsString(ConfigEvent event) {
45-
if (Objects.equals(event.getOldSource(), event.getNewSource())) {
46-
return event.getNewSource();
47-
} else {
48-
return event.getOldSource() + "->" + event.getNewSource();
46+
private static String sourceAsString(ConfigEvent event) {
47+
final String oldValue = event.getOldSource();
48+
final String newValue = event.getNewSource();
49+
50+
if (Objects.equals(oldValue, newValue)) {
51+
return newValue;
4952
}
53+
return (oldValue == null || oldValue.isEmpty()) ? newValue : oldValue + "->" + newValue;
5054
}
5155

52-
private String propValueAsString(ConfigEvent event) {
53-
if (event.getOldValue() != null && event.getNewValue() != null) {
54-
return "***->***";
55-
} else if (event.getOldValue() != null) {
56-
return "***->null";
57-
} else if (event.getNewValue() != null) {
58-
return "null->***";
59-
} else {
60-
return null;
56+
private static String propValueAsString(ConfigEvent event) {
57+
final String oldValue = event.getOldValue();
58+
final String newValue = event.getNewValue();
59+
60+
if (Objects.equals(oldValue, newValue)) {
61+
return newValue;
62+
}
63+
return (oldValue == null || oldValue.isEmpty())
64+
? mask(newValue)
65+
: mask(oldValue) + "->" + mask(newValue);
66+
}
67+
68+
private static String mask(String value) {
69+
if (value == null || value.isEmpty()) {
70+
return "null";
71+
}
72+
if (value.length() < 5) {
73+
return "***";
6174
}
75+
return value.replace(value.substring(2, value.length() - 2), "***");
6276
}
6377
}

0 commit comments

Comments
 (0)