Skip to content

Commit 73513b4

Browse files
committed
Resolve snakeyaml issue
1 parent 8dcbf35 commit 73513b4

File tree

2 files changed

+16
-0
lines changed
  • kubernetes/src/test/java/oracle/kubernetes/operator/utils
  • operator/src/test/java/oracle/kubernetes/operator/utils

2 files changed

+16
-0
lines changed

kubernetes/src/test/java/oracle/kubernetes/operator/utils/YamlUtils.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
import io.kubernetes.client.custom.IntOrString;
88
import io.kubernetes.client.custom.Quantity;
9+
import java.util.Map;
910
import java.util.Objects;
11+
import java.util.TreeMap;
1012
import org.hamcrest.Description;
1113
import org.hamcrest.TypeSafeDiagnosingMatcher;
1214
import org.yaml.snakeyaml.DumperOptions;
@@ -45,6 +47,12 @@ private MyRepresenter() {
4547
representers.put(IntOrString.class, new RepresentIntOrString());
4648
}
4749

50+
@Override
51+
protected Node representMapping(Tag tag, Map<?, ?> mapping, DumperOptions.FlowStyle flowStyle) {
52+
Map<?, ?> sortedMapping = new TreeMap<>(mapping);
53+
return super.representMapping(tag, sortedMapping, flowStyle);
54+
}
55+
4856
private class RepresentIntOrString implements Represent {
4957
public Node representData(Object data) {
5058
IntOrString val = (IntOrString) data;

operator/src/test/java/oracle/kubernetes/operator/utils/YamlUtils.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66

77
import io.kubernetes.client.custom.IntOrString;
88
import io.kubernetes.client.custom.Quantity;
9+
import java.util.Map;
910
import java.util.Objects;
11+
import java.util.TreeMap;
1012
import org.hamcrest.Description;
1113
import org.hamcrest.TypeSafeDiagnosingMatcher;
1214
import org.yaml.snakeyaml.DumperOptions;
@@ -45,6 +47,12 @@ private MyRepresenter() {
4547
representers.put(IntOrString.class, new RepresentIntOrString());
4648
}
4749

50+
@Override
51+
protected Node representMapping(Tag tag, Map<?, ?> mapping, DumperOptions.FlowStyle flowStyle) {
52+
Map<?, ?> sortedMapping = new TreeMap<>(mapping);
53+
return super.representMapping(tag, sortedMapping, flowStyle);
54+
}
55+
4856
private class RepresentIntOrString implements Represent {
4957
public Node representData(Object data) {
5058
IntOrString val = (IntOrString) data;

0 commit comments

Comments
 (0)