Skip to content
This repository was archived by the owner on Jan 31, 2024. It is now read-only.

Commit 67b9828

Browse files
committed
Upgraded to Spring Boot 1.4.0.RELEASE
1 parent a36d853 commit 67b9828

File tree

6 files changed

+43
-11
lines changed

6 files changed

+43
-11
lines changed

pom.xml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>1.4.0.RC1</version>
17+
<version>1.4.0.RELEASE</version>
1818
</parent>
1919

2020
<properties>
@@ -24,8 +24,8 @@
2424

2525
<aspectj.version>1.8.8</aspectj.version>
2626
<slf4j.version>1.7.16</slf4j.version>
27-
<spring-boot.version>1.4.0.RC1</spring-boot.version>
28-
<spring.version>4.3.1.RELEASE</spring.version>
27+
<spring-boot.version>1.4.0.RELEASE</spring-boot.version>
28+
<spring.version>4.3.2.RELEASE</spring.version>
2929
<spring-security.version>4.1.1.RELEASE</spring-security.version>
3030
<hibernate.version>5.2.1.Final</hibernate.version>
3131
<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
@@ -426,6 +426,13 @@
426426
<!--dependencies for testing -->
427427

428428
<!--test -->
429+
<dependency>
430+
<groupId>com.google.code.gson</groupId>
431+
<artifactId>gson</artifactId>
432+
<version>2.7</version>
433+
<scope>test</scope>
434+
</dependency>
435+
429436
<dependency>
430437
<groupId>org.springframework.boot</groupId>
431438
<artifactId>spring-boot-starter-test</artifactId>

src/test/java/com/hantsylabs/restexample/springmvc/test/mockbean/MockBeanBlogServiceTest.java renamed to src/test/java/com/hantsylabs/restexample/springmvc/test/mock/MockBeanBlogServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.hantsylabs.restexample.springmvc.test.mockbean;
1+
package com.hantsylabs.restexample.springmvc.test.mock;
22

33
import com.hantsylabs.restexample.springmvc.domain.Post;
44
import com.hantsylabs.restexample.springmvc.model.PostDetails;

src/test/java/com/hantsylabs/restexample/springmvc/test/LocalDateTimeJsonComponentTest.java renamed to src/test/java/com/hantsylabs/restexample/springmvc/test/slice/LocalDateTimeJsonComponentTest.java

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,23 @@
1-
package com.hantsylabs.restexample.springmvc.test;
1+
package com.hantsylabs.restexample.springmvc.test.slice;
22

3+
import java.time.Instant;
34
import java.time.LocalDateTime;
5+
import java.time.ZoneId;
46
import java.util.HashMap;
57
import java.util.Map;
68
import javax.inject.Inject;
79
import lombok.AllArgsConstructor;
810
import lombok.Data;
911
import lombok.NoArgsConstructor;
12+
import lombok.ToString;
1013
import lombok.extern.slf4j.Slf4j;
14+
import static org.assertj.core.api.Assertions.assertThat;
1115
import static org.junit.Assert.assertNotNull;
16+
import static org.junit.Assert.assertTrue;
1217
import org.junit.Test;
1318
import org.junit.runner.RunWith;
1419
import org.springframework.boot.test.autoconfigure.json.JsonTest;
20+
import org.springframework.boot.test.json.JacksonTester;
1521
import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder;
1622
import org.springframework.test.context.junit4.SpringRunner;
1723

@@ -21,14 +27,32 @@
2127
*/
2228
@RunWith(SpringRunner.class)
2329
@JsonTest()
24-
//@SpringBootTest
25-
//@AutoConfigureJsonTesters
2630
@Slf4j
2731
public class LocalDateTimeJsonComponentTest {
2832

33+
@Inject
34+
JacksonTester<TimeObj> tester;
35+
2936
@Inject
3037
Jackson2ObjectMapperBuilder mapper;
3138

39+
@Test
40+
public void testJsonWithJacksonTester() throws Exception {
41+
42+
assertNotNull(tester);
43+
44+
String dateTimeStirng = "2016-03-29T20:05:01.101Z";
45+
LocalDateTime dateTime = LocalDateTime.ofInstant(Instant.parse(dateTimeStirng), ZoneId.systemDefault());
46+
TimeObj obj = new TimeObj(dateTime);
47+
48+
assertThat(tester.write(obj).getJson()).containsIgnoringCase("{\"now\":\"2016-03-29T20:05:01.101Z\"}");
49+
50+
TimeObj parsedDateTime = tester.parseObject("{\"now\":\"2016-03-29T20:05:01.101Z\"}");
51+
log.debug("parsed Date time @" + parsedDateTime);
52+
53+
assertTrue(dateTime.equals(parsedDateTime.getNow()));
54+
}
55+
3256
@Test
3357
public void testJson() throws Exception {
3458

@@ -47,6 +71,7 @@ public void testJson() throws Exception {
4771
@Data
4872
@NoArgsConstructor
4973
@AllArgsConstructor
74+
@ToString
5075
static class TimeObj {
5176

5277
private LocalDateTime now;

src/test/java/com/hantsylabs/restexample/springmvc/test/mockbean/SimpleDataJpaTest.java renamed to src/test/java/com/hantsylabs/restexample/springmvc/test/slice/SimpleDataJpaTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.hantsylabs.restexample.springmvc.test.mockbean;
1+
package com.hantsylabs.restexample.springmvc.test.slice;
22

33
import com.hantsylabs.restexample.springmvc.repository.CommentRepository;
44
import com.hantsylabs.restexample.springmvc.repository.PostRepository;

src/test/java/com/hantsylabs/restexample/springmvc/test/mockbean/SimpleRestClientTest.java renamed to src/test/java/com/hantsylabs/restexample/springmvc/test/slice/SimpleRestClientTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.hantsylabs.restexample.springmvc.test.mockbean;
1+
package com.hantsylabs.restexample.springmvc.test.slice;
22

33
import com.hantsylabs.restexample.springmvc.model.PostDetails;
4-
import com.hantsylabs.restexample.springmvc.test.mockbean.SimpleRestClientTest.ClientBlogService;
4+
import com.hantsylabs.restexample.springmvc.test.slice.SimpleRestClientTest.ClientBlogService;
55
import javax.inject.Inject;
66
import org.junit.Test;
77
import org.junit.runner.RunWith;

src/test/java/com/hantsylabs/restexample/springmvc/test/mockbean/SimpleWebMvcTest.java renamed to src/test/java/com/hantsylabs/restexample/springmvc/test/slice/SimpleWebMvcTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.hantsylabs.restexample.springmvc.test.mockbean;
1+
package com.hantsylabs.restexample.springmvc.test.slice;
22

33
import com.hantsylabs.restexample.springmvc.api.post.PostController;
44
import com.hantsylabs.restexample.springmvc.model.PostDetails;

0 commit comments

Comments
 (0)