From a97a56cd976200ba5e69e9af3ed031eedb833252 Mon Sep 17 00:00:00 2001 From: DOHA Date: Tue, 17 Jul 2018 19:47:56 +0300 Subject: [PATCH 1/4] guide to jmapper --- libraries/pom.xml | 7 ++ .../main/java/com/baeldung/jmapper/User.java | 56 +++++++++ .../java/com/baeldung/jmapper/UserDto.java | 69 +++++++++++ .../java/com/baeldung/jmapper/UserDto1.java | 47 ++++++++ .../com/baeldung/jmapper/relational/User.java | 49 ++++++++ .../baeldung/jmapper/relational/UserDto1.java | 44 +++++++ .../baeldung/jmapper/relational/UserDto2.java | 44 +++++++ libraries/src/main/resources/user_jmapper.xml | 10 ++ .../src/main/resources/user_jmapper1.xml | 5 + .../src/main/resources/user_jmapper2.xml | 21 ++++ .../jmapper/JMapperIntegrationTest.java | 114 ++++++++++++++++++ .../JMapperRelationalIntegrationTest.java | 76 ++++++++++++ 12 files changed, 542 insertions(+) create mode 100644 libraries/src/main/java/com/baeldung/jmapper/User.java create mode 100644 libraries/src/main/java/com/baeldung/jmapper/UserDto.java create mode 100644 libraries/src/main/java/com/baeldung/jmapper/UserDto1.java create mode 100644 libraries/src/main/java/com/baeldung/jmapper/relational/User.java create mode 100644 libraries/src/main/java/com/baeldung/jmapper/relational/UserDto1.java create mode 100644 libraries/src/main/java/com/baeldung/jmapper/relational/UserDto2.java create mode 100644 libraries/src/main/resources/user_jmapper.xml create mode 100644 libraries/src/main/resources/user_jmapper1.xml create mode 100644 libraries/src/main/resources/user_jmapper2.xml create mode 100644 libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java create mode 100644 libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java diff --git a/libraries/pom.xml b/libraries/pom.xml index 163f5872ce..69c55c4533 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -772,6 +772,12 @@ test + + com.googlecode.jmapper-framework + jmapper-core + ${jmapper.version} + + @@ -1015,6 +1021,7 @@ 1.19.4 1.6.0 4.5.1 + 1.6.0.1 3.3.0 3.0.2 diff --git a/libraries/src/main/java/com/baeldung/jmapper/User.java b/libraries/src/main/java/com/baeldung/jmapper/User.java new file mode 100644 index 0000000000..9f99157183 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jmapper/User.java @@ -0,0 +1,56 @@ +package com.baeldung.jmapper; + +import java.time.LocalDate; + + +public class User { + + private long id; + private String email; + private LocalDate birthDate; + + // constructors + + public User() { + super(); + } + + public User(long id, String email, LocalDate birthDate) { + super(); + this.id = id; + this.email = email; + this.birthDate = birthDate; + } + + // getters and setters + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public LocalDate getBirthDate() { + return birthDate; + } + + public void setBirthDate(LocalDate birthDate) { + this.birthDate = birthDate; + } + + @Override + public String toString() { + return "User [id=" + id + ", email=" + email + ", birthDate=" + birthDate + "]"; + } + +} diff --git a/libraries/src/main/java/com/baeldung/jmapper/UserDto.java b/libraries/src/main/java/com/baeldung/jmapper/UserDto.java new file mode 100644 index 0000000000..326e8f3cd5 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jmapper/UserDto.java @@ -0,0 +1,69 @@ +package com.baeldung.jmapper; + +import java.time.LocalDate; +import java.time.Period; + +import com.googlecode.jmapper.annotations.JMap; +import com.googlecode.jmapper.annotations.JMapConversion; + +public class UserDto { + + @JMap + private long id; + + @JMap("email") + private String username; + + @JMap("birthDate") + private int age; + + @JMapConversion(from={"birthDate"}, to={"age"}) + public int conversion(LocalDate birthDate){ + return Period.between(birthDate, LocalDate.now()).getYears(); + } + + // constructors + + public UserDto() { + super(); + } + + public UserDto(long id, String username, int age) { + super(); + this.id = id; + this.username = username; + this.age = age; + } + + // getters and setters + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } + + @Override + public String toString() { + return "UserDto [id=" + id + ", username=" + username + ", age=" + age + "]"; + } + +} diff --git a/libraries/src/main/java/com/baeldung/jmapper/UserDto1.java b/libraries/src/main/java/com/baeldung/jmapper/UserDto1.java new file mode 100644 index 0000000000..99247c56f6 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jmapper/UserDto1.java @@ -0,0 +1,47 @@ +package com.baeldung.jmapper; + +import com.googlecode.jmapper.annotations.JGlobalMap; + +@JGlobalMap +public class UserDto1 { + + private long id; + private String email; + + + // constructors + + public UserDto1() { + super(); + } + + public UserDto1(long id, String email) { + super(); + this.id = id; + this.email = email; + } + + // getters and setters + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public String toString() { + return "UserDto [id=" + id + ", email=" + email + "]"; + } + +} diff --git a/libraries/src/main/java/com/baeldung/jmapper/relational/User.java b/libraries/src/main/java/com/baeldung/jmapper/relational/User.java new file mode 100644 index 0000000000..1238a82684 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jmapper/relational/User.java @@ -0,0 +1,49 @@ +package com.baeldung.jmapper.relational; + +import com.googlecode.jmapper.annotations.JMap; + + +public class User { + + @JMap(classes = {UserDto1.class, UserDto2.class}) + private long id; + + @JMap(attributes = {"username", "email"}, classes = {UserDto1.class, UserDto2.class}) + private String email; + + // constructors + + public User() { + super(); + } + + public User(long id, String email) { + super(); + this.id = id; + this.email = email; + } + + // getters and setters + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public String toString() { + return "User [id=" + id + ", email=" + email + "]"; + } + +} diff --git a/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto1.java b/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto1.java new file mode 100644 index 0000000000..375fd267a0 --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto1.java @@ -0,0 +1,44 @@ +package com.baeldung.jmapper.relational; + + +public class UserDto1 { + + private long id; + private String username; + + // constructors + + public UserDto1() { + super(); + } + + public UserDto1(long id, String username) { + super(); + this.id = id; + this.username = username; + } + + // getters and setters + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + @Override + public String toString() { + return "UserDto [id=" + id + ", username=" + username + "]"; + } + +} diff --git a/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto2.java b/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto2.java new file mode 100644 index 0000000000..d0858c7d8e --- /dev/null +++ b/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto2.java @@ -0,0 +1,44 @@ +package com.baeldung.jmapper.relational; + + +public class UserDto2 { + + private long id; + private String email; + + // constructors + + public UserDto2() { + super(); + } + + public UserDto2(long id, String email) { + super(); + this.id = id; + this.email = email; + } + + // getters and setters + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public String toString() { + return "UserDto2 [id=" + id + ", email=" + email + "]"; + } + +} diff --git a/libraries/src/main/resources/user_jmapper.xml b/libraries/src/main/resources/user_jmapper.xml new file mode 100644 index 0000000000..f007de9f0a --- /dev/null +++ b/libraries/src/main/resources/user_jmapper.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/libraries/src/main/resources/user_jmapper1.xml b/libraries/src/main/resources/user_jmapper1.xml new file mode 100644 index 0000000000..abcfd77e1c --- /dev/null +++ b/libraries/src/main/resources/user_jmapper1.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/libraries/src/main/resources/user_jmapper2.xml b/libraries/src/main/resources/user_jmapper2.xml new file mode 100644 index 0000000000..1e708e14bf --- /dev/null +++ b/libraries/src/main/resources/user_jmapper2.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java b/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java new file mode 100644 index 0000000000..d2ad65d840 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java @@ -0,0 +1,114 @@ +package com.baeldung.jmapper; + +import static com.googlecode.jmapper.api.JMapperAPI.attribute; +import static com.googlecode.jmapper.api.JMapperAPI.global; +import static com.googlecode.jmapper.api.JMapperAPI.mappedClass; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.time.LocalDate; + +import org.junit.Test; + +import com.googlecode.jmapper.JMapper; +import com.googlecode.jmapper.api.JMapperAPI; + +public class JMapperIntegrationTest { + + + @Test + public void giventUser_whenUseAnnotation_thenConverted(){ + JMapper userMapper = new JMapper<>(UserDto.class, User.class); + + User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); + UserDto result = userMapper.getDestination(user); + + System.out.println(result); + assertEquals(user.getId(), result.getId()); + assertEquals(user.getEmail(), result.getUsername()); + } + + @Test + public void giventUser_whenUseGlobalMapAnnotation_thenConverted(){ + JMapper userMapper= new JMapper<>(UserDto1.class, User.class); + + User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); + UserDto1 result = userMapper.getDestination(user); + + System.out.println(result); + assertEquals(user.getId(), result.getId()); + assertEquals(user.getEmail(), result.getEmail()); + } + + @Test + public void giventUser_whenUseAnnotationExplicitConversion_thenConverted(){ + JMapper userMapper = new JMapper<>(UserDto.class, User.class); + + User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); + UserDto result = userMapper.getDestination(user); + + System.out.println(result); + assertEquals(user.getId(), result.getId()); + assertEquals(user.getEmail(), result.getUsername()); + assertTrue(result.getAge() > 0); + } + + //======================= XML + + @Test + public void giventUser_whenUseXml_thenConverted(){ + JMapper userMapper = new JMapper<>(UserDto.class, User.class,"user_jmapper.xml"); + + User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); + UserDto result = userMapper.getDestination(user); + + System.out.println(result); + assertEquals(user.getId(), result.getId()); + assertEquals(user.getEmail(), result.getUsername()); + } + + @Test + public void giventUser_whenUseXmlGlobal_thenConverted(){ + JMapper userMapper = new JMapper<>(UserDto1.class, User.class,"user_jmapper1.xml"); + + User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); + UserDto1 result = userMapper.getDestination(user); + + System.out.println(result); + assertEquals(user.getId(), result.getId()); + assertEquals(user.getEmail(), result.getEmail()); + } + + // ===== API + + @Test + public void giventUser_whenUseApi_thenConverted(){ + JMapperAPI jmapperApi = new JMapperAPI() .add(mappedClass(UserDto.class) + .add(attribute("id").value("id")) + .add(attribute("username").value("email")) + ) ; + JMapper userMapper = new JMapper<>(UserDto.class, User.class, jmapperApi); + + User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); + UserDto result = userMapper.getDestination(user); + + System.out.println(result); + assertEquals(user.getId(), result.getId()); + assertEquals(user.getEmail(), result.getUsername()); + } + + @Test + public void giventUser_whenUseApiGlobal_thenConverted(){ + JMapperAPI jmapperApi = new JMapperAPI() .add(mappedClass(UserDto.class) + .add(global()) + ) ; + JMapper userMapper1 = new JMapper<>(UserDto1.class, User.class,jmapperApi); + + User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); + UserDto1 result = userMapper1.getDestination(user); + + System.out.println(result); + assertEquals(user.getId(), result.getId()); + assertEquals(user.getEmail(), result.getEmail()); + } +} diff --git a/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java b/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java new file mode 100644 index 0000000000..054332a704 --- /dev/null +++ b/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java @@ -0,0 +1,76 @@ +package com.baeldung.jmapper; + +import static com.googlecode.jmapper.api.JMapperAPI.attribute; +import static com.googlecode.jmapper.api.JMapperAPI.mappedClass; +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +import com.baeldung.jmapper.relational.User; +import com.baeldung.jmapper.relational.UserDto1; +import com.baeldung.jmapper.relational.UserDto2; +import com.googlecode.jmapper.RelationalJMapper; +import com.googlecode.jmapper.api.JMapperAPI; + +public class JMapperRelationalIntegrationTest { + + + @Test + public void giventUser_whenUseAnnotation_thenConverted(){ + RelationalJMapper relationalMapper = new RelationalJMapper<>(User.class); + + User user = new User(1L,"john@test.com"); + UserDto1 result1 = relationalMapper.oneToMany(UserDto1.class, user); + UserDto2 result2= relationalMapper.oneToMany(UserDto2.class, user); + + System.out.println(result1); + System.out.println(result2); + assertEquals(user.getId(), result1.getId()); + assertEquals(user.getEmail(), result1.getUsername()); + assertEquals(user.getId(), result2.getId()); + assertEquals(user.getEmail(), result2.getEmail()); + } + + //======================= XML + + @Test + public void giventUser_whenUseXml_thenConverted(){ + RelationalJMapper relationalMapper = new RelationalJMapper<>(User.class,"user_jmapper2.xml"); + + User user = new User(1L,"john@test.com"); + UserDto1 result1 = relationalMapper.oneToMany(UserDto1.class, user); + UserDto2 result2 = relationalMapper.oneToMany(UserDto2.class, user); + + System.out.println(result1); + System.out.println(result2); + assertEquals(user.getId(), result1.getId()); + assertEquals(user.getEmail(), result1.getUsername()); + assertEquals(user.getId(), result2.getId()); + assertEquals(user.getEmail(), result2.getEmail()); + } + + + // ===== API + + @Test + public void giventUser_whenUseApi_thenConverted(){ + JMapperAPI jmapperApi = new JMapperAPI() + .add(mappedClass(User.class) + .add(attribute("id").value("id").targetClasses(UserDto1.class,UserDto2.class)) + .add(attribute("email").targetAttributes("username","email").targetClasses(UserDto1.class,UserDto2.class)) ) + ; + RelationalJMapper relationalMapper = new RelationalJMapper<>(User.class,jmapperApi); + + User user = new User(1L,"john@test.com"); + UserDto1 result1 = relationalMapper.oneToMany(UserDto1.class, user); + UserDto2 result2 = relationalMapper.oneToMany(UserDto2.class, user); + + System.out.println(result1); + System.out.println(result2); + assertEquals(user.getId(), result1.getId()); + assertEquals(user.getEmail(), result1.getUsername()); + assertEquals(user.getId(), result2.getId()); + assertEquals(user.getEmail(), result2.getEmail()); + } + +} From 3b89043202deb1e8d528056b8aec1614f7d2206f Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Wed, 18 Jul 2018 20:51:01 +0300 Subject: [PATCH 2/4] Update JMapperIntegrationTest.java --- .../baeldung/jmapper/JMapperIntegrationTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java b/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java index d2ad65d840..96ed090482 100644 --- a/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java +++ b/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java @@ -17,7 +17,7 @@ public class JMapperIntegrationTest { @Test - public void giventUser_whenUseAnnotation_thenConverted(){ + public void givenUser_whenUseAnnotation_thenConverted(){ JMapper userMapper = new JMapper<>(UserDto.class, User.class); User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); @@ -29,7 +29,7 @@ public class JMapperIntegrationTest { } @Test - public void giventUser_whenUseGlobalMapAnnotation_thenConverted(){ + public void givenUser_whenUseGlobalMapAnnotation_thenConverted(){ JMapper userMapper= new JMapper<>(UserDto1.class, User.class); User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); @@ -41,7 +41,7 @@ public class JMapperIntegrationTest { } @Test - public void giventUser_whenUseAnnotationExplicitConversion_thenConverted(){ + public void givenUser_whenUseAnnotationExplicitConversion_thenConverted(){ JMapper userMapper = new JMapper<>(UserDto.class, User.class); User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); @@ -56,7 +56,7 @@ public class JMapperIntegrationTest { //======================= XML @Test - public void giventUser_whenUseXml_thenConverted(){ + public void givenUser_whenUseXml_thenConverted(){ JMapper userMapper = new JMapper<>(UserDto.class, User.class,"user_jmapper.xml"); User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); @@ -68,7 +68,7 @@ public class JMapperIntegrationTest { } @Test - public void giventUser_whenUseXmlGlobal_thenConverted(){ + public void givenUser_whenUseXmlGlobal_thenConverted(){ JMapper userMapper = new JMapper<>(UserDto1.class, User.class,"user_jmapper1.xml"); User user = new User(1L,"john@test.com", LocalDate.of(1980,8,20)); @@ -82,7 +82,7 @@ public class JMapperIntegrationTest { // ===== API @Test - public void giventUser_whenUseApi_thenConverted(){ + public void givenUser_whenUseApi_thenConverted(){ JMapperAPI jmapperApi = new JMapperAPI() .add(mappedClass(UserDto.class) .add(attribute("id").value("id")) .add(attribute("username").value("email")) @@ -98,7 +98,7 @@ public class JMapperIntegrationTest { } @Test - public void giventUser_whenUseApiGlobal_thenConverted(){ + public void givenUser_whenUseApiGlobal_thenConverted(){ JMapperAPI jmapperApi = new JMapperAPI() .add(mappedClass(UserDto.class) .add(global()) ) ; From 83a1443380dd89e22364a65221d43e226868eff0 Mon Sep 17 00:00:00 2001 From: Loredana Crusoveanu Date: Wed, 18 Jul 2018 20:51:23 +0300 Subject: [PATCH 3/4] Update JMapperRelationalIntegrationTest.java --- .../baeldung/jmapper/JMapperRelationalIntegrationTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java b/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java index 054332a704..6af2865159 100644 --- a/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java +++ b/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java @@ -16,7 +16,7 @@ public class JMapperRelationalIntegrationTest { @Test - public void giventUser_whenUseAnnotation_thenConverted(){ + public void givenUser_whenUseAnnotation_thenConverted(){ RelationalJMapper relationalMapper = new RelationalJMapper<>(User.class); User user = new User(1L,"john@test.com"); @@ -34,7 +34,7 @@ public class JMapperRelationalIntegrationTest { //======================= XML @Test - public void giventUser_whenUseXml_thenConverted(){ + public void givenUser_whenUseXml_thenConverted(){ RelationalJMapper relationalMapper = new RelationalJMapper<>(User.class,"user_jmapper2.xml"); User user = new User(1L,"john@test.com"); @@ -53,7 +53,7 @@ public class JMapperRelationalIntegrationTest { // ===== API @Test - public void giventUser_whenUseApi_thenConverted(){ + public void givenUser_whenUseApi_thenConverted(){ JMapperAPI jmapperApi = new JMapperAPI() .add(mappedClass(User.class) .add(attribute("id").value("id").targetClasses(UserDto1.class,UserDto2.class)) From ca170308eef53da4ef8ac3d7e8b6520cc06e9af8 Mon Sep 17 00:00:00 2001 From: DOHA Date: Sat, 21 Jul 2018 15:20:53 +0300 Subject: [PATCH 4/4] move jmapper to libraries-data --- libraries-data/pom.xml | 8 ++++++++ .../src/main/java/com/baeldung/jmapper/User.java | 0 .../src/main/java/com/baeldung/jmapper/UserDto.java | 0 .../src/main/java/com/baeldung/jmapper/UserDto1.java | 0 .../main/java/com/baeldung/jmapper/relational/User.java | 0 .../java/com/baeldung/jmapper/relational/UserDto1.java | 0 .../java/com/baeldung/jmapper/relational/UserDto2.java | 0 .../src/main/resources/user_jmapper.xml | 0 .../src/main/resources/user_jmapper1.xml | 0 .../src/main/resources/user_jmapper2.xml | 0 .../java/com/baeldung/jmapper/JMapperIntegrationTest.java | 0 .../jmapper/JMapperRelationalIntegrationTest.java | 0 libraries/pom.xml | 7 ------- 13 files changed, 8 insertions(+), 7 deletions(-) rename {libraries => libraries-data}/src/main/java/com/baeldung/jmapper/User.java (100%) rename {libraries => libraries-data}/src/main/java/com/baeldung/jmapper/UserDto.java (100%) rename {libraries => libraries-data}/src/main/java/com/baeldung/jmapper/UserDto1.java (100%) rename {libraries => libraries-data}/src/main/java/com/baeldung/jmapper/relational/User.java (100%) rename {libraries => libraries-data}/src/main/java/com/baeldung/jmapper/relational/UserDto1.java (100%) rename {libraries => libraries-data}/src/main/java/com/baeldung/jmapper/relational/UserDto2.java (100%) rename {libraries => libraries-data}/src/main/resources/user_jmapper.xml (100%) rename {libraries => libraries-data}/src/main/resources/user_jmapper1.xml (100%) rename {libraries => libraries-data}/src/main/resources/user_jmapper2.xml (100%) rename {libraries => libraries-data}/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java (100%) rename {libraries => libraries-data}/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java (100%) diff --git a/libraries-data/pom.xml b/libraries-data/pom.xml index 3a18ffd2e8..e5e8fd5551 100644 --- a/libraries-data/pom.xml +++ b/libraries-data/pom.xml @@ -141,6 +141,13 @@ hazelcast ${hazelcast.version} + + + com.googlecode.jmapper-framework + jmapper-core + ${jmapper.version} + + @@ -275,6 +282,7 @@ 5.0.2 5.0.0-release 5.0.4 + 1.6.0.1 diff --git a/libraries/src/main/java/com/baeldung/jmapper/User.java b/libraries-data/src/main/java/com/baeldung/jmapper/User.java similarity index 100% rename from libraries/src/main/java/com/baeldung/jmapper/User.java rename to libraries-data/src/main/java/com/baeldung/jmapper/User.java diff --git a/libraries/src/main/java/com/baeldung/jmapper/UserDto.java b/libraries-data/src/main/java/com/baeldung/jmapper/UserDto.java similarity index 100% rename from libraries/src/main/java/com/baeldung/jmapper/UserDto.java rename to libraries-data/src/main/java/com/baeldung/jmapper/UserDto.java diff --git a/libraries/src/main/java/com/baeldung/jmapper/UserDto1.java b/libraries-data/src/main/java/com/baeldung/jmapper/UserDto1.java similarity index 100% rename from libraries/src/main/java/com/baeldung/jmapper/UserDto1.java rename to libraries-data/src/main/java/com/baeldung/jmapper/UserDto1.java diff --git a/libraries/src/main/java/com/baeldung/jmapper/relational/User.java b/libraries-data/src/main/java/com/baeldung/jmapper/relational/User.java similarity index 100% rename from libraries/src/main/java/com/baeldung/jmapper/relational/User.java rename to libraries-data/src/main/java/com/baeldung/jmapper/relational/User.java diff --git a/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto1.java b/libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto1.java similarity index 100% rename from libraries/src/main/java/com/baeldung/jmapper/relational/UserDto1.java rename to libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto1.java diff --git a/libraries/src/main/java/com/baeldung/jmapper/relational/UserDto2.java b/libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto2.java similarity index 100% rename from libraries/src/main/java/com/baeldung/jmapper/relational/UserDto2.java rename to libraries-data/src/main/java/com/baeldung/jmapper/relational/UserDto2.java diff --git a/libraries/src/main/resources/user_jmapper.xml b/libraries-data/src/main/resources/user_jmapper.xml similarity index 100% rename from libraries/src/main/resources/user_jmapper.xml rename to libraries-data/src/main/resources/user_jmapper.xml diff --git a/libraries/src/main/resources/user_jmapper1.xml b/libraries-data/src/main/resources/user_jmapper1.xml similarity index 100% rename from libraries/src/main/resources/user_jmapper1.xml rename to libraries-data/src/main/resources/user_jmapper1.xml diff --git a/libraries/src/main/resources/user_jmapper2.xml b/libraries-data/src/main/resources/user_jmapper2.xml similarity index 100% rename from libraries/src/main/resources/user_jmapper2.xml rename to libraries-data/src/main/resources/user_jmapper2.xml diff --git a/libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java similarity index 100% rename from libraries/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java rename to libraries-data/src/test/java/com/baeldung/jmapper/JMapperIntegrationTest.java diff --git a/libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java b/libraries-data/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java similarity index 100% rename from libraries/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java rename to libraries-data/src/test/java/com/baeldung/jmapper/JMapperRelationalIntegrationTest.java diff --git a/libraries/pom.xml b/libraries/pom.xml index 69c55c4533..163f5872ce 100644 --- a/libraries/pom.xml +++ b/libraries/pom.xml @@ -772,12 +772,6 @@ test - - com.googlecode.jmapper-framework - jmapper-core - ${jmapper.version} - - @@ -1021,7 +1015,6 @@ 1.19.4 1.6.0 4.5.1 - 1.6.0.1 3.3.0 3.0.2