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
54c72cf3
Commit
54c72cf3
authored
Jun 13, 2019
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Polish
parent
985c8f75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
JerseyAutoConfiguration.java
...rk/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
+1
-1
ElasticsearchDataAutoConfigurationTests.java
...lasticsearch/ElasticsearchDataAutoConfigurationTests.java
+6
-6
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View file @
54c72cf3
...
@@ -207,7 +207,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
...
@@ -207,7 +207,7 @@ public class JerseyAutoConfiguration implements ServletContextAware {
};
};
}
}
@Configuration
@Configuration
(
proxyBeanMethods
=
false
)
@ConditionalOnClass
({
JaxbAnnotationIntrospector
.
class
,
XmlElement
.
class
})
@ConditionalOnClass
({
JaxbAnnotationIntrospector
.
class
,
XmlElement
.
class
})
static
class
JaxbObjectMapperCustomizer
{
static
class
JaxbObjectMapperCustomizer
{
...
...
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/elasticsearch/ElasticsearchDataAutoConfigurationTests.java
View file @
54c72cf3
...
@@ -109,31 +109,31 @@ class ElasticsearchDataAutoConfigurationTests {
...
@@ -109,31 +109,31 @@ class ElasticsearchDataAutoConfigurationTests {
.
contains
(
"reactiveElasticsearchTemplate"
));
.
contains
(
"reactiveElasticsearchTemplate"
));
}
}
@Configuration
@Configuration
(
proxyBeanMethods
=
false
)
static
class
CustomTransportTemplate
{
static
class
CustomTransportTemplate
{
@Bean
@Bean
ElasticsearchTemplate
elasticsearchTemplate
()
{
public
ElasticsearchTemplate
elasticsearchTemplate
()
{
return
mock
(
ElasticsearchTemplate
.
class
);
return
mock
(
ElasticsearchTemplate
.
class
);
}
}
}
}
@Configuration
@Configuration
(
proxyBeanMethods
=
false
)
static
class
CustomRestTemplate
{
static
class
CustomRestTemplate
{
@Bean
@Bean
ElasticsearchRestTemplate
elasticsearchTemplate
()
{
public
ElasticsearchRestTemplate
elasticsearchTemplate
()
{
return
mock
(
ElasticsearchRestTemplate
.
class
);
return
mock
(
ElasticsearchRestTemplate
.
class
);
}
}
}
}
@Configuration
@Configuration
(
proxyBeanMethods
=
false
)
static
class
CustomReactiveRestTemplate
{
static
class
CustomReactiveRestTemplate
{
@Bean
@Bean
ReactiveElasticsearchTemplate
reactiveElasticsearchTemplate
()
{
public
ReactiveElasticsearchTemplate
reactiveElasticsearchTemplate
()
{
return
mock
(
ReactiveElasticsearchTemplate
.
class
);
return
mock
(
ReactiveElasticsearchTemplate
.
class
);
}
}
...
...
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