Skip to content

S
spring-boot
Commit 9087c247 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.4.x' 

See gh-25820
parents 676713be 8bb4020b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java
View file @ 9087c247
...@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.data.rest; ...@@ -18,7 +18,6 @@ package org.springframework.boot.autoconfigure.data.rest;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.data.rest.core.config.RepositoryRestConfiguration; import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer; import org.springframework.data.rest.webmvc.config.RepositoryRestConfigurer;
...@@ -37,10 +36,8 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry; ...@@ -37,10 +36,8 @@ import org.springframework.web.servlet.config.annotation.CorsRegistry;
@Order(0) @Order(0)
class SpringBootRepositoryRestConfigurer implements RepositoryRestConfigurer { class SpringBootRepositoryRestConfigurer implements RepositoryRestConfigurer {
@Autowired(required = false)
private final Jackson2ObjectMapperBuilder objectMapperBuilder; private final Jackson2ObjectMapperBuilder objectMapperBuilder;
@Autowired
private final RepositoryRestProperties properties; private final RepositoryRestProperties properties;
SpringBootRepositoryRestConfigurer(Jackson2ObjectMapperBuilder objectMapperBuilder, SpringBootRepositoryRestConfigurer(Jackson2ObjectMapperBuilder objectMapperBuilder,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment