fix: Ensure that the name property of @ComponentApplication is applied

dekorateio · Jul 18, 2019 · f6545a1 · f6545a1
1 parent 9e704c3
commit f6545a1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/...mponent-annotations/src/it/issue-254/src/test/java/io/dekorate/issue254/Issue254Test.java b/...mponent-annotations/src/it/issue-254/src/test/java/io/dekorate/issue254/Issue254Test.java
@@ -38,6 +38,7 @@ public void shouldExposeService() {
     Optional<Component> component = findFirst(list, Component.class);
     assertTrue(component.isPresent());
     assertTrue(component.get().getSpec().isExposeService());
+    assertEquals("issue-254", component.get().getMetadata().getName());
     assertEquals(8080, (long)component.get().getSpec().getPort());
   }
 

diff --git a/...nent-annotations/src/it/issue-275/src/main/java/io/dekorate/issue275/DemoApplication.java b/...nent-annotations/src/it/issue-275/src/main/java/io/dekorate/issue275/DemoApplication.java
@@ -6,7 +6,7 @@
 import io.dekorate.component.annotation.ComponentApplication;
 
 @SpringBootApplication
-@ComponentApplication(exposeService=true)
+@ComponentApplication(exposeService=true, name="customName")
 public class DemoApplication {
 
 	public static void main(String[] args) {

diff --git a/...mponent-annotations/src/it/issue-275/src/test/java/io/dekorate/issue275/Issue275Test.java b/...mponent-annotations/src/it/issue-275/src/test/java/io/dekorate/issue275/Issue275Test.java
@@ -38,6 +38,7 @@ public void shouldExposeServiceAndHaveCorrectPort() {
     Optional<Component> component = findFirst(list, Component.class);
     assertTrue(component.isPresent());
     assertTrue(component.get().getSpec().isExposeService());
+    assertEquals("customName", component.get().getMetadata().getName());
     assertEquals(9090, (long)component.get().getSpec().getPort());
   }
 

diff --git a/...s/component-annotations/src/main/java/io/dekorate/component/handler/ComponentHandler.java b/...s/component-annotations/src/main/java/io/dekorate/component/handler/ComponentHandler.java
@@ -152,7 +152,7 @@ private BaseConfig getKubernetesConfig() {
   private Component createComponent(ComponentConfig config) {
        return new ComponentBuilder()
       .withNewMetadata()
-      .withName(resources.getName())
+      .withName(config.getName())
       .withLabels(resources.getLabels())
       .endMetadata()
       .withNewSpec()