cleanup work

This commit is contained in:
eugenp 2016-08-02 12:46:27 +03:00
parent e83b4b8523
commit 81da6c5c63
15 changed files with 484 additions and 511 deletions

View File

@ -1,10 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.baeldung</groupId> <groupId>com.baeldung</groupId>
<artifactId>dozer-tutorial</artifactId> <artifactId>dozer-tutorial</artifactId>
<version>1.0</version> <version>1.0</version>
<name>Dozer</name>
<name>dozer</name>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -18,36 +21,31 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.5</version> <version>1.7.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId> <artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version> <version>1.7.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.2.1</version> <version>3.2.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.1</version>
</dependency>
<dependency>
<groupId>net.sf.dozer</groupId> <groupId>net.sf.dozer</groupId>
<artifactId>dozer</artifactId> <artifactId>dozer</artifactId>
<version>5.5.1</version> <version>5.5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
@ -56,4 +54,5 @@
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

View File

@ -11,8 +11,7 @@ import org.dozer.MappingException;
public class MyCustomConvertor implements CustomConverter { public class MyCustomConvertor implements CustomConverter {
@Override @Override
public Object convert(Object dest, Object source, Class<?> arg2, public Object convert(Object dest, Object source, Class<?> arg2, Class<?> arg3) {
Class<?> arg3) {
if (source == null) { if (source == null) {
return null; return null;
} }
@ -31,16 +30,13 @@ public class MyCustomConvertor implements CustomConverter {
date = format.parse(person.getDtob()); date = format.parse(person.getDtob());
} catch (ParseException e) { } catch (ParseException e) {
throw new MappingException("Converter MyCustomConvertor " throw new MappingException("Converter MyCustomConvertor " + "used incorrectly:" + e.getMessage());
+ "used incorrectly:" + e.getMessage());
} }
long timestamp = date.getTime(); long timestamp = date.getTime();
return new Personne3(person.getName(), timestamp); return new Personne3(person.getName(), timestamp);
} else { } else {
throw new MappingException("Converter MyCustomConvertor " throw new MappingException("Converter MyCustomConvertor " + "used incorrectly. Arguments passed in were:" + dest + " and " + source);
+ "used incorrectly. Arguments passed in were:" + dest
+ " and " + source);
} }
} }

View File

@ -35,5 +35,4 @@ public class Person3 {
return "Person3 [name=" + name + ", dtob=" + dtob + "]"; return "Person3 [name=" + name + ", dtob=" + dtob + "]";
} }
} }

View File

@ -25,8 +25,7 @@ public class DozerTest {
@Override @Override
protected void configure() { protected void configure() {
mapping(Person.class, Personne.class).fields("name", "nom").fields( mapping(Person.class, Personne.class).fields("name", "nom").fields("nickname", "surnom");
"nickname", "surnom");
} }
}; };
@ -34,8 +33,7 @@ public class DozerTest {
@Override @Override
protected void configure() { protected void configure() {
mapping(Person.class, Personne.class).fields("name", "nom") mapping(Person.class, Personne.class).fields("name", "nom").fields("nickname", "surnom").exclude("age");
.fields("nickname", "surnom").exclude("age");
} }
}; };
@ -44,13 +42,11 @@ public class DozerTest {
public void givenApiMapper_whenMaps_thenCorrect() { public void givenApiMapper_whenMaps_thenCorrect() {
mapper.addMapping(builder); mapper.addMapping(builder);
Personne frenchAppPerson = new Personne("Sylvester Stallone", "Rambo", Personne frenchAppPerson = new Personne("Sylvester Stallone", "Rambo", 70);
70);
Person englishAppPerson = mapper.map(frenchAppPerson, Person.class); Person englishAppPerson = mapper.map(frenchAppPerson, Person.class);
assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom()); assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom());
assertEquals(englishAppPerson.getNickname(), assertEquals(englishAppPerson.getNickname(), frenchAppPerson.getSurnom());
frenchAppPerson.getSurnom());
assertEquals(englishAppPerson.getAge(), frenchAppPerson.getAge()); assertEquals(englishAppPerson.getAge(), frenchAppPerson.getAge());
} }
@ -62,8 +58,7 @@ public class DozerTest {
Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class); Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName()); assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
assertEquals(frenchAppPerson.getSurnom(), assertEquals(frenchAppPerson.getSurnom(), englishAppPerson.getNickname());
englishAppPerson.getNickname());
assertEquals(frenchAppPerson.getAge(), 0); assertEquals(frenchAppPerson.getAge(), 0);
} }
@ -75,8 +70,7 @@ public class DozerTest {
Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class); Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName()); assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
assertEquals(frenchAppPerson.getSurnom(), assertEquals(frenchAppPerson.getSurnom(), englishAppPerson.getNickname());
englishAppPerson.getNickname());
assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge()); assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge());
} }
@ -109,13 +103,11 @@ public class DozerTest {
public void givenSrcAndDestWithDifferentFieldNamesWithCustomMapper_whenMaps_thenCorrect() { public void givenSrcAndDestWithDifferentFieldNamesWithCustomMapper_whenMaps_thenCorrect() {
configureMapper("dozer_mapping.xml"); configureMapper("dozer_mapping.xml");
Personne frenchAppPerson = new Personne("Sylvester Stallone", "Rambo", Personne frenchAppPerson = new Personne("Sylvester Stallone", "Rambo", 70);
70);
Person englishAppPerson = mapper.map(frenchAppPerson, Person.class); Person englishAppPerson = mapper.map(frenchAppPerson, Person.class);
assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom()); assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom());
assertEquals(englishAppPerson.getNickname(), assertEquals(englishAppPerson.getNickname(), frenchAppPerson.getSurnom());
frenchAppPerson.getSurnom());
assertEquals(englishAppPerson.getAge(), frenchAppPerson.getAge()); assertEquals(englishAppPerson.getAge(), frenchAppPerson.getAge());
} }
@ -127,8 +119,7 @@ public class DozerTest {
Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class); Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName()); assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
assertEquals(frenchAppPerson.getSurnom(), assertEquals(frenchAppPerson.getSurnom(), englishAppPerson.getNickname());
englishAppPerson.getNickname());
assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge()); assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge());
} }
@ -137,13 +128,11 @@ public class DozerTest {
public void givenMappingFileOutsideClasspath_whenMaps_thenCorrect() { public void givenMappingFileOutsideClasspath_whenMaps_thenCorrect() {
configureMapper("file:e:/dozer_mapping.xml"); configureMapper("file:e:/dozer_mapping.xml");
Person englishAppPerson = new Person("Marshall Bruce Mathers III", Person englishAppPerson = new Person("Marshall Bruce Mathers III", "Eminem", 43);
"Eminem", 43);
Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class); Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName()); assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
assertEquals(frenchAppPerson.getSurnom(), assertEquals(frenchAppPerson.getSurnom(), englishAppPerson.getNickname());
englishAppPerson.getNickname());
assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge()); assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge());
} }
@ -155,31 +144,25 @@ public class DozerTest {
Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class); Personne frenchAppPerson = mapper.map(englishAppPerson, Personne.class);
assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName()); assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
assertEquals(frenchAppPerson.getSurnom(), assertEquals(frenchAppPerson.getSurnom(), englishAppPerson.getNickname());
englishAppPerson.getNickname());
assertEquals(frenchAppPerson.getAge(), 0); assertEquals(frenchAppPerson.getAge(), 0);
} }
@Test @Test
public void givenAnnotatedSrcFields_whenMapsToRightDestField_thenCorrect() { public void givenAnnotatedSrcFields_whenMapsToRightDestField_thenCorrect() {
Person2 englishAppPerson = new Person2("Jean-Claude Van Damme", "JCVD", Person2 englishAppPerson = new Person2("Jean-Claude Van Damme", "JCVD", 55);
55); Personne2 frenchAppPerson = mapper.map(englishAppPerson, Personne2.class);
Personne2 frenchAppPerson = mapper.map(englishAppPerson,
Personne2.class);
assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName()); assertEquals(frenchAppPerson.getNom(), englishAppPerson.getName());
assertEquals(frenchAppPerson.getSurnom(), assertEquals(frenchAppPerson.getSurnom(), englishAppPerson.getNickname());
englishAppPerson.getNickname());
assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge()); assertEquals(frenchAppPerson.getAge(), englishAppPerson.getAge());
} }
@Test @Test
public void givenAnnotatedSrcFields_whenMapsToRightDestFieldBidirectionally_thenCorrect() { public void givenAnnotatedSrcFields_whenMapsToRightDestFieldBidirectionally_thenCorrect() {
Personne2 frenchAppPerson = new Personne2("Jason Statham", Personne2 frenchAppPerson = new Personne2("Jason Statham", "transporter", 49);
"transporter", 49);
Person2 englishAppPerson = mapper.map(frenchAppPerson, Person2.class); Person2 englishAppPerson = mapper.map(frenchAppPerson, Person2.class);
assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom()); assertEquals(englishAppPerson.getName(), frenchAppPerson.getNom());
assertEquals(englishAppPerson.getNickname(), assertEquals(englishAppPerson.getNickname(), frenchAppPerson.getSurnom());
frenchAppPerson.getSurnom());
assertEquals(englishAppPerson.getAge(), frenchAppPerson.getAge()); assertEquals(englishAppPerson.getAge(), frenchAppPerson.getAge());
} }
@ -194,9 +177,7 @@ public class DozerTest {
Personne3 person0 = mapper.map(person, Personne3.class); Personne3 person0 = mapper.map(person, Personne3.class);
long timestampToTest = person0.getDtob(); long timestampToTest = person0.getDtob();
assertTrue(timestampToTest == timestamp assertTrue(timestampToTest == timestamp || timestampToTest >= timestamp - GMT_DIFFERENCE || timestampToTest <= timestamp + GMT_DIFFERENCE);
|| timestampToTest >= timestamp - GMT_DIFFERENCE
|| timestampToTest <= timestamp + GMT_DIFFERENCE);
} }
@Test @Test
@ -208,8 +189,7 @@ public class DozerTest {
Person3 person0 = mapper.map(person, Person3.class); Person3 person0 = mapper.map(person, Person3.class);
String timestampTest = person0.getDtob(); String timestampTest = person0.getDtob();
assertTrue(timestampTest.charAt(10) == 'T' assertTrue(timestampTest.charAt(10) == 'T' && timestampTest.charAt(19) == 'Z');
&& timestampTest.charAt(19) == 'Z');
} }
public void configureMapper(String... mappingFileUrls) { public void configureMapper(String... mappingFileUrls) {

View File

@ -4,13 +4,11 @@ import java.io.IOException;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import org.junit.runner.RunWith;
import org.springframework.boot.test.IntegrationTest; import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationContextLoader; import org.springframework.boot.test.SpringApplicationContextLoader;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.ClientHttpResponse;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.test.context.web.WebAppConfiguration; import org.springframework.test.context.web.WebAppConfiguration;
import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.ResponseExtractor; import org.springframework.web.client.ResponseExtractor;

View File

@ -1,12 +1,13 @@
package com.baeldung; package com.baeldung;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import org.springframework.http.HttpStatus;
import cucumber.api.java.en.And; import cucumber.api.java.en.And;
import cucumber.api.java.en.Then; import cucumber.api.java.en.Then;
import cucumber.api.java.en.When; import cucumber.api.java.en.When;
import org.springframework.http.HttpStatus;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
public class StepDefs extends SpringIntegrationTest { public class StepDefs extends SpringIntegrationTest {