From 16b38741becfb811357ef92ea353728c0e16b0e1 Mon Sep 17 00:00:00 2001
From: Cavero Barca <carlos.cavero@atos.net>
Date: Fri, 30 Oct 2020 17:44:33 +0100
Subject: [PATCH] Correct the artifactid and names to match with the folder
 following the guidelines

---
 docker/docker-internal-dto/pom.xml                            | 3 ++-
 .../main/java/com/baeldung/docker/{ => dto}/VariableDto.java  | 2 +-
 docker/docker-spring-boot/pom.xml                             | 2 +-
 .../com/baeldung/docker/{ => spring}/DemoApplication.java     | 2 +-
 .../com/baeldung/docker/{ => spring}/HelloController.java     | 2 +-
 docker/pom.xml                                                | 4 ++--
 6 files changed, 8 insertions(+), 7 deletions(-)
 rename docker/docker-internal-dto/src/main/java/com/baeldung/docker/{ => dto}/VariableDto.java (85%)
 rename docker/docker-spring-boot/src/main/java/com/baeldung/docker/{ => spring}/DemoApplication.java (88%)
 rename docker/docker-spring-boot/src/main/java/com/baeldung/docker/{ => spring}/HelloController.java (90%)

diff --git a/docker/docker-internal-dto/pom.xml b/docker/docker-internal-dto/pom.xml
index d7ba6d7373..01b92f81dc 100644
--- a/docker/docker-internal-dto/pom.xml
+++ b/docker/docker-internal-dto/pom.xml
@@ -5,10 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker-spring-boot-parent</artifactId>
+        <artifactId>docker</artifactId>
         <version>0.0.1</version>
     </parent>
 
     <artifactId>docker-internal-dto</artifactId>
+	<name>docker-internal-dto</name>
 
 </project>
\ No newline at end of file
diff --git a/docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
similarity index 85%
rename from docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java
rename to docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
index 86e173e351..2de3b734ea 100644
--- a/docker/docker-internal-dto/src/main/java/com/baeldung/docker/VariableDto.java
+++ b/docker/docker-internal-dto/src/main/java/com/baeldung/docker/dto/VariableDto.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.dto;
 
 public class VariableDto {
 
diff --git a/docker/docker-spring-boot/pom.xml b/docker/docker-spring-boot/pom.xml
index 9524f68a5a..74bd1561cf 100644
--- a/docker/docker-spring-boot/pom.xml
+++ b/docker/docker-spring-boot/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.baeldung.docker</groupId>
-        <artifactId>docker-spring-boot-parent</artifactId>
+        <artifactId>docker</artifactId>
         <version>0.0.1</version>
     </parent>
 
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
similarity index 88%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java
rename to docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
index e0c1d57e89..9210cabbb3 100644
--- a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/DemoApplication.java
+++ b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/DemoApplication.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.spring;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
similarity index 90%
rename from docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java
rename to docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
index b463bb557f..430a158011 100644
--- a/docker/docker-spring-boot/src/main/java/com/baeldung/docker/HelloController.java
+++ b/docker/docker-spring-boot/src/main/java/com/baeldung/docker/spring/HelloController.java
@@ -1,4 +1,4 @@
-package com.baeldung.docker;
+package com.baeldung.docker.spring;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
diff --git a/docker/pom.xml b/docker/pom.xml
index 3668ceb0fc..f05c303938 100644
--- a/docker/pom.xml
+++ b/docker/pom.xml
@@ -12,9 +12,9 @@
     </parent>
 
     <groupId>com.baeldung.docker</groupId>
-    <artifactId>docker-spring-boot-parent</artifactId>
+    <artifactId>docker</artifactId>
     <version>0.0.1</version>
-    <name>docker-spring-boot-parent</name>
+    <name>docker</name>
     <description>Demo project showing Spring Boot and Docker</description>
     <packaging>pom</packaging>