Skip to content

Commit a5b9bca

Browse files
committed
Don't use configure RestTemplateBuilder from application context
As we don't want to pickup any customizations for the RestTemplate we shouldn't pick up any preconfigured RestTemplateBuilder in our client configuration. closes #1157
1 parent 2279439 commit a5b9bca

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

spring-boot-admin-client/src/main/java/de/codecentric/boot/admin/client/config/SpringBootAdminClientAutoConfiguration.java

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2014-2018 the original author or authors.
2+
* Copyright 2014-2019 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.
@@ -46,8 +46,6 @@
4646
import org.springframework.context.annotation.Conditional;
4747
import org.springframework.context.annotation.Configuration;
4848
import org.springframework.context.annotation.Primary;
49-
import org.springframework.http.client.SimpleClientHttpRequestFactory;
50-
import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
5149

5250
import static org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
5351

@@ -107,13 +105,9 @@ public ApplicationFactory applicationFactory(InstanceProperties instance,
107105

108106
@Bean
109107
@ConditionalOnMissingBean
110-
public ApplicationRegistrator registrator(ClientProperties client,
111-
ApplicationFactory applicationFactory,
112-
RestTemplateBuilder restTemplBuilder) {
113-
RestTemplateBuilder builder = restTemplBuilder.messageConverters(new MappingJackson2HttpMessageConverter())
114-
.requestFactory(SimpleClientHttpRequestFactory.class)
115-
.setConnectTimeout(client.getConnectTimeout())
116-
.setReadTimeout(client.getReadTimeout());
108+
public ApplicationRegistrator registrator(ClientProperties client, ApplicationFactory applicationFactory) {
109+
RestTemplateBuilder builder = new RestTemplateBuilder().setConnectTimeout(client.getConnectTimeout())
110+
.setReadTimeout(client.getReadTimeout());
117111
if (client.getUsername() != null) {
118112
builder = builder.basicAuthentication(client.getUsername(), client.getPassword());
119113
}

0 commit comments

Comments
 (0)