Merge pull request #6720 from amit2103/BAEL-14089

[BAEL-14089] - Moved code for Entity to DTO article

spring-boot-rest/pom.xml

@@ -63,6 +63,11 @@
             <artifactId>htmlunit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.modelmapper</groupId>
+            <artifactId>modelmapper</artifactId>
+            <version>${modelmapper.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -78,5 +83,6 @@
         <start-class>com.baeldung.SpringBootRestApplication</start-class>
         <guava.version>27.0.1-jre</guava.version>
         <xstream.version>1.4.11.1</xstream.version>
+        <modelmapper.version>2.3.3</modelmapper.version>
     </properties>
 </project>

spring-boot-rest/src/main/java/com/baeldung/SpringBootRestApplication.java

@@ -1,7 +1,9 @@
 package com.baeldung;
 
+import org.modelmapper.ModelMapper;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class SpringBootRestApplication {
@@ -9,5 +11,10 @@ public class SpringBootRestApplication {
     public static void main(String[] args) {
         SpringApplication.run(SpringBootRestApplication.class, args);
     }
+    
+    @Bean
+    public ModelMapper modelMapper() {
+        return new ModelMapper();
+    }
 
 }

spring-boot-rest/src/main/java/com/baeldung/spring/PersistenceConfig.java

@@ -24,8 +24,8 @@ import com.google.common.base.Preconditions;
 @Configuration
 @EnableTransactionManagement
 @PropertySource({ "classpath:persistence-${envTarget:h2}.properties" })
-@ComponentScan({ "com.baeldung.persistence" })
+@ComponentScan(basePackages = { "com.baeldung.persistence", "com.baeldung.modelmapper" })
-@EnableJpaRepositories(basePackages = "com.baeldung.persistence.dao")
+@EnableJpaRepositories(basePackages = {"com.baeldung.persistence.dao", "com.baeldung.modelmapper.repository"})
 public class PersistenceConfig {
 
     @Autowired
@@ -39,7 +39,7 @@ public class PersistenceConfig {
     public LocalContainerEntityManagerFactoryBean entityManagerFactory() {
         final LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean();
         em.setDataSource(dataSource());
-        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model" });
+        em.setPackagesToScan(new String[] { "com.baeldung.persistence.model", "com.baeldung.modelmapper.model" });
 
         final HibernateJpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
         // vendorAdapter.set

spring-boot-rest/src/test/java/com/baeldung/SpringContextIntegrationTest.java

@@ -6,7 +6,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
 @RunWith(SpringRunner.class)
-@SpringBootTest
+@SpringBootTest(classes = {SpringBootRestApplication.class})
 public class SpringContextIntegrationTest {
 
     @Test

spring-boot/pom.xml

@@ -153,12 +153,6 @@
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
         </dependency>
-        
-        <dependency>
-            <groupId>org.modelmapper</groupId>
-            <artifactId>modelmapper</artifactId>
-            <version>${modelmapper.version}</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -256,7 +250,6 @@
         <graphql-java-tools.version>5.2.4</graphql-java-tools.version>
         <guava.version>18.0</guava.version>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
-        <modelmapper.version>2.3.2</modelmapper.version>
     </properties>
 
 </project>

spring-boot/src/main/java/com/baeldung/modelmapper/PostApplication.java

@@ -1,20 +0,0 @@
-package com.baeldung.modelmapper;
-
-import org.modelmapper.ModelMapper;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
-
-@SpringBootApplication
-public class PostApplication {
-    
-    public static void main(String[] args) {
-        SpringApplication.run(PostApplication.class, args);
-    }
-    
-    @Bean
-    public ModelMapper modelMapper() {
-        return new ModelMapper();
-    }
-
-}