From 182023538b8eaa4adb8721732062c8e6b34214fb Mon Sep 17 00:00:00 2001 From: Jose Date: Wed, 24 May 2023 10:28:32 +0200 Subject: [PATCH] Preserve the order of decorators by declaration --- .../main/java/io/dekorate/kubernetes/decorator/Decorator.java | 3 ++- .../src/main/resources/application.properties | 2 ++ .../io/dekorate/example/FeatOverwriteInitContainersTest.java | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/io/dekorate/kubernetes/decorator/Decorator.java b/core/src/main/java/io/dekorate/kubernetes/decorator/Decorator.java index ba30d3da2..a2d52de4f 100644 --- a/core/src/main/java/io/dekorate/kubernetes/decorator/Decorator.java +++ b/core/src/main/java/io/dekorate/kubernetes/decorator/Decorator.java @@ -63,6 +63,7 @@ public int compareTo(Decorator o) { if (this.equals(o)) { return 0; } - return -1; + + return 1; } } diff --git a/tests/feat-overwrite-init-containers/src/main/resources/application.properties b/tests/feat-overwrite-init-containers/src/main/resources/application.properties index 492e0a0e6..725e106cc 100644 --- a/tests/feat-overwrite-init-containers/src/main/resources/application.properties +++ b/tests/feat-overwrite-init-containers/src/main/resources/application.properties @@ -1,2 +1,4 @@ dekorate.kubernetes.init-containers[0].name=foo +dekorate.kubernetes.init-containers[0].command=sh dekorate.kubernetes.init-containers[1].name=foo +dekorate.kubernetes.init-containers[1].command=sh updated diff --git a/tests/feat-overwrite-init-containers/src/test/java/io/dekorate/example/FeatOverwriteInitContainersTest.java b/tests/feat-overwrite-init-containers/src/test/java/io/dekorate/example/FeatOverwriteInitContainersTest.java index 8518d2ccb..098573e17 100644 --- a/tests/feat-overwrite-init-containers/src/test/java/io/dekorate/example/FeatOverwriteInitContainersTest.java +++ b/tests/feat-overwrite-init-containers/src/test/java/io/dekorate/example/FeatOverwriteInitContainersTest.java @@ -40,6 +40,7 @@ public void shouldContainOnlyOneInitContainer() { assertEquals("feat-overwrite-init-containers", s.getMetadata().getName()); assertEquals(1, s.getSpec().getTemplate().getSpec().getInitContainers().size()); assertEquals("foo", s.getSpec().getTemplate().getSpec().getInitContainers().get(0).getName()); + assertEquals("sh updated", s.getSpec().getTemplate().getSpec().getInitContainers().get(0).getCommand().get(0)); } Optional findFirst(KubernetesList list, Class t) {