Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
4c2a7db4
Commit
4c2a7db4
authored
Jan 20, 2021
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Upgrade to Spring Data 2021.0.0-M2
Closes gh-24931
parent
20b7016a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
11 deletions
+5
-11
ElasticsearchDataConfiguration.java
...re/data/elasticsearch/ElasticsearchDataConfiguration.java
+3
-3
SpringBootRepositoryRestConfigurer.java
...nfigure/data/rest/SpringBootRepositoryRestConfigurer.java
+1
-7
build.gradle
spring-boot-project/spring-boot-dependencies/build.gradle
+1
-1
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataConfiguration.java
View file @
4c2a7db4
/*
* Copyright 2012-202
0
the original author or authors.
* Copyright 2012-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -17,7 +17,6 @@
package
org
.
springframework
.
boot
.
autoconfigure
.
data
.
elasticsearch
;
import
org.elasticsearch.action.support.IndicesOptions
;
import
org.elasticsearch.action.support.WriteRequest
;
import
org.elasticsearch.client.RestHighLevelClient
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnBean
;
...
...
@@ -30,6 +29,7 @@ import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
import
org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate
;
import
org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations
;
import
org.springframework.data.elasticsearch.core.ReactiveElasticsearchTemplate
;
import
org.springframework.data.elasticsearch.core.RefreshPolicy
;
import
org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter
;
import
org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter
;
import
org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext
;
...
...
@@ -87,7 +87,7 @@ abstract class ElasticsearchDataConfiguration {
ElasticsearchConverter
converter
)
{
ReactiveElasticsearchTemplate
template
=
new
ReactiveElasticsearchTemplate
(
client
,
converter
);
template
.
setIndicesOptions
(
IndicesOptions
.
strictExpandOpenAndForbidClosed
());
template
.
setRefreshPolicy
(
WriteRequest
.
RefreshPolicy
.
IMMEDIATE
);
template
.
setRefreshPolicy
(
RefreshPolicy
.
IMMEDIATE
);
return
template
;
}
...
...
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/SpringBootRepositoryRestConfigurer.java
View file @
4c2a7db4
/*
* Copyright 2012-202
0
the original author or authors.
* Copyright 2012-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -43,12 +43,6 @@ class SpringBootRepositoryRestConfigurer implements RepositoryRestConfigurer {
@Autowired
private
RepositoryRestProperties
properties
;
@Override
@SuppressWarnings
(
"deprecation"
)
public
void
configureRepositoryRestConfiguration
(
RepositoryRestConfiguration
config
)
{
configureRepositoryRestConfiguration
(
config
,
null
);
}
@Override
public
void
configureRepositoryRestConfiguration
(
RepositoryRestConfiguration
config
,
CorsRegistry
cors
)
{
this
.
properties
.
applyTo
(
config
);
...
...
spring-boot-project/spring-boot-dependencies/build.gradle
View file @
4c2a7db4
...
...
@@ -1552,7 +1552,7 @@ bom {
]
}
}
library
(
"Spring Data Bom"
,
"202
0.0.
2"
)
{
library
(
"Spring Data Bom"
,
"202
1.0.0-M
2"
)
{
group
(
"org.springframework.data"
)
{
imports
=
[
"spring-data-bom"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment