Skip to content

Commit 99f33d5

Browse files
committed
Start building against Spring Data Kay snapshots
See gh-13890
1 parent 1ab98ca commit 99f33d5

File tree

2 files changed

+2
-31
lines changed

2 files changed

+2
-31
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestMvcAutoConfigurationTests.java

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2017 the original author or authors.
2+
* Copyright 2012-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,11 +17,7 @@
1717
package org.springframework.boot.autoconfigure.data.rest;
1818

1919
import java.net.URI;
20-
import java.util.Date;
21-
import java.util.Map;
2220

23-
import com.fasterxml.jackson.core.JsonProcessingException;
24-
import com.fasterxml.jackson.databind.ObjectMapper;
2521
import org.junit.After;
2622
import org.junit.Test;
2723

@@ -146,31 +142,6 @@ public void backOffWithCustomConfiguration() {
146142
assertThat(bean.getBaseUri()).isEqualTo(URI.create(""));
147143
}
148144

149-
@Test
150-
public void objectMappersAreConfiguredUsingObjectMapperBuilder()
151-
throws JsonProcessingException {
152-
load(TestConfigurationWithObjectMapperBuilder.class);
153-
154-
assertThatDateIsFormattedCorrectly("halObjectMapper");
155-
assertThatDateIsFormattedCorrectly("objectMapper");
156-
}
157-
158-
@Test
159-
public void primaryObjectMapperIsAvailable() {
160-
load(TestConfiguration.class);
161-
Map<String, ObjectMapper> objectMappers = this.context
162-
.getBeansOfType(ObjectMapper.class);
163-
assertThat(objectMappers.size()).isGreaterThan(1);
164-
this.context.getBean(ObjectMapper.class);
165-
}
166-
167-
public void assertThatDateIsFormattedCorrectly(String beanName)
168-
throws JsonProcessingException {
169-
ObjectMapper objectMapper = this.context.getBean(beanName, ObjectMapper.class);
170-
assertThat(objectMapper.writeValueAsString(new Date(1413387983267L)))
171-
.isEqualTo("\"2014-10\"");
172-
}
173-
174145
private void load(Class<?> config, String... environment) {
175146
AnnotationConfigWebApplicationContext applicationContext = new AnnotationConfigWebApplicationContext();
176147
applicationContext.setServletContext(new MockServletContext());

spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@
155155
<spring-amqp.version>2.0.5.BUILD-SNAPSHOT</spring-amqp.version>
156156
<spring-batch.version>4.0.1.RELEASE</spring-batch.version>
157157
<spring-cloud-connectors.version>2.0.2.RELEASE</spring-cloud-connectors.version>
158-
<spring-data-releasetrain.version>Kay-SR8</spring-data-releasetrain.version>
158+
<spring-data-releasetrain.version>Kay-BUILD-SNAPSHOT</spring-data-releasetrain.version>
159159
<spring-hateoas.version>0.25.0.BUILD-SNAPSHOT</spring-hateoas.version>
160160
<spring-integration.version>5.0.7.BUILD-SNAPSHOT</spring-integration.version>
161161
<spring-kafka.version>2.1.8.BUILD-SNAPSHOT</spring-kafka.version>

0 commit comments

Comments
 (0)