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
8b14754c
Commit
8b14754c
authored
Oct 15, 2018
by
dreis2211
Committed by
Stephane Nicoll
Oct 16, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove usages of BasicAuthorizationInterceptor
See gh-14830
parent
3bda1993
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
50 additions
and
35 deletions
+50
-35
spring-boot-features.adoc
...ing-boot-docs/src/main/asciidoc/spring-boot-features.adoc
+1
-1
TestRestTemplate.java
...pringframework/boot/test/web/client/TestRestTemplate.java
+3
-3
TestRestTemplateTests.java
...framework/boot/test/web/client/TestRestTemplateTests.java
+2
-2
RestTemplateBuilder.java
.../springframework/boot/web/client/RestTemplateBuilder.java
+37
-23
RestTemplateBuilderTests.java
...ngframework/boot/web/client/RestTemplateBuilderTests.java
+7
-6
No files found.
spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View file @
8b14754c
...
@@ -5914,7 +5914,7 @@ The following code shows a typical example:
...
@@ -5914,7 +5914,7 @@ The following code shows a typical example:
TIP: `RestTemplateBuilder` includes a number of useful methods that can be used to
TIP: `RestTemplateBuilder` includes a number of useful methods that can be used to
quickly configure a `RestTemplate`. For example, to add BASIC auth support, you can use
quickly configure a `RestTemplate`. For example, to add BASIC auth support, you can use
`builder.basicAuth
oriz
ation("user", "password").build()`.
`builder.basicAuth
entic
ation("user", "password").build()`.
...
...
spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View file @
8b14754c
...
@@ -51,7 +51,7 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
...
@@ -51,7 +51,7 @@ import org.springframework.http.client.ClientHttpRequestInterceptor;
import
org.springframework.http.client.ClientHttpResponse
;
import
org.springframework.http.client.ClientHttpResponse
;
import
org.springframework.http.client.HttpComponentsClientHttpRequestFactory
;
import
org.springframework.http.client.HttpComponentsClientHttpRequestFactory
;
import
org.springframework.http.client.InterceptingClientHttpRequestFactory
;
import
org.springframework.http.client.InterceptingClientHttpRequestFactory
;
import
org.springframework.http.client.support.BasicAuth
oriz
ationInterceptor
;
import
org.springframework.http.client.support.BasicAuth
entic
ationInterceptor
;
import
org.springframework.util.Assert
;
import
org.springframework.util.Assert
;
import
org.springframework.util.ReflectionUtils
;
import
org.springframework.util.ReflectionUtils
;
import
org.springframework.web.client.DefaultResponseErrorHandler
;
import
org.springframework.web.client.DefaultResponseErrorHandler
;
...
@@ -172,8 +172,8 @@ public class TestRestTemplate {
...
@@ -172,8 +172,8 @@ public class TestRestTemplate {
interceptors
=
Collections
.
emptyList
();
interceptors
=
Collections
.
emptyList
();
}
}
interceptors
=
new
ArrayList
<>(
interceptors
);
interceptors
=
new
ArrayList
<>(
interceptors
);
interceptors
.
removeIf
(
BasicAuth
oriz
ationInterceptor
.
class
::
isInstance
);
interceptors
.
removeIf
(
BasicAuth
entic
ationInterceptor
.
class
::
isInstance
);
interceptors
.
add
(
new
BasicAuth
oriz
ationInterceptor
(
username
,
password
));
interceptors
.
add
(
new
BasicAuth
entic
ationInterceptor
(
username
,
password
));
restTemplate
.
setInterceptors
(
interceptors
);
restTemplate
.
setInterceptors
(
interceptors
);
}
}
...
...
spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java
View file @
8b14754c
...
@@ -39,7 +39,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
...
@@ -39,7 +39,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import
org.springframework.http.client.InterceptingClientHttpRequestFactory
;
import
org.springframework.http.client.InterceptingClientHttpRequestFactory
;
import
org.springframework.http.client.OkHttp3ClientHttpRequestFactory
;
import
org.springframework.http.client.OkHttp3ClientHttpRequestFactory
;
import
org.springframework.http.client.SimpleClientHttpRequestFactory
;
import
org.springframework.http.client.SimpleClientHttpRequestFactory
;
import
org.springframework.http.client.support.BasicAuth
oriz
ationInterceptor
;
import
org.springframework.http.client.support.BasicAuth
entic
ationInterceptor
;
import
org.springframework.mock.env.MockEnvironment
;
import
org.springframework.mock.env.MockEnvironment
;
import
org.springframework.mock.http.client.MockClientHttpRequest
;
import
org.springframework.mock.http.client.MockClientHttpRequest
;
import
org.springframework.mock.http.client.MockClientHttpResponse
;
import
org.springframework.mock.http.client.MockClientHttpResponse
;
...
@@ -371,7 +371,7 @@ public class TestRestTemplateTests {
...
@@ -371,7 +371,7 @@ public class TestRestTemplateTests {
"interceptors"
);
"interceptors"
);
assertThat
(
requestFactoryInterceptors
).
hasSize
(
1
);
assertThat
(
requestFactoryInterceptors
).
hasSize
(
1
);
ClientHttpRequestInterceptor
interceptor
=
requestFactoryInterceptors
.
get
(
0
);
ClientHttpRequestInterceptor
interceptor
=
requestFactoryInterceptors
.
get
(
0
);
assertThat
(
interceptor
).
isInstanceOf
(
BasicAuth
oriz
ationInterceptor
.
class
);
assertThat
(
interceptor
).
isInstanceOf
(
BasicAuth
entic
ationInterceptor
.
class
);
assertThat
(
interceptor
).
hasFieldOrPropertyWithValue
(
"username"
,
username
);
assertThat
(
interceptor
).
hasFieldOrPropertyWithValue
(
"username"
,
username
);
assertThat
(
interceptor
).
hasFieldOrPropertyWithValue
(
"password"
,
password
);
assertThat
(
interceptor
).
hasFieldOrPropertyWithValue
(
"password"
,
password
);
...
...
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
View file @
8b14754c
This diff is collapsed.
Click to expand it.
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
View file @
8b14754c
...
@@ -34,7 +34,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
...
@@ -34,7 +34,7 @@ import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import
org.springframework.http.client.InterceptingClientHttpRequestFactory
;
import
org.springframework.http.client.InterceptingClientHttpRequestFactory
;
import
org.springframework.http.client.OkHttp3ClientHttpRequestFactory
;
import
org.springframework.http.client.OkHttp3ClientHttpRequestFactory
;
import
org.springframework.http.client.SimpleClientHttpRequestFactory
;
import
org.springframework.http.client.SimpleClientHttpRequestFactory
;
import
org.springframework.http.client.support.BasicAuth
oriz
ationInterceptor
;
import
org.springframework.http.client.support.BasicAuth
entic
ationInterceptor
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.HttpMessageConverter
;
import
org.springframework.http.converter.ResourceHttpMessageConverter
;
import
org.springframework.http.converter.ResourceHttpMessageConverter
;
import
org.springframework.http.converter.StringHttpMessageConverter
;
import
org.springframework.http.converter.StringHttpMessageConverter
;
...
@@ -321,10 +321,11 @@ public class RestTemplateBuilderTests {
...
@@ -321,10 +321,11 @@ public class RestTemplateBuilderTests {
}
}
@Test
@Test
public
void
basicAuthorizationShouldApply
()
{
public
void
basicAuthenticationShouldApply
()
{
RestTemplate
template
=
this
.
builder
.
basicAuthorization
(
"spring"
,
"boot"
).
build
();
RestTemplate
template
=
this
.
builder
.
basicAuthentication
(
"spring"
,
"boot"
)
.
build
();
ClientHttpRequestInterceptor
interceptor
=
template
.
getInterceptors
().
get
(
0
);
ClientHttpRequestInterceptor
interceptor
=
template
.
getInterceptors
().
get
(
0
);
assertThat
(
interceptor
).
isInstanceOf
(
BasicAuth
oriz
ationInterceptor
.
class
);
assertThat
(
interceptor
).
isInstanceOf
(
BasicAuth
entic
ationInterceptor
.
class
);
assertThat
(
interceptor
).
extracting
(
"username"
).
containsExactly
(
"spring"
);
assertThat
(
interceptor
).
extracting
(
"username"
).
containsExactly
(
"spring"
);
assertThat
(
interceptor
).
extracting
(
"password"
).
containsExactly
(
"boot"
);
assertThat
(
interceptor
).
extracting
(
"password"
).
containsExactly
(
"boot"
);
}
}
...
@@ -400,11 +401,11 @@ public class RestTemplateBuilderTests {
...
@@ -400,11 +401,11 @@ public class RestTemplateBuilderTests {
ClientHttpRequestFactory
requestFactory
=
new
HttpComponentsClientHttpRequestFactory
();
ClientHttpRequestFactory
requestFactory
=
new
HttpComponentsClientHttpRequestFactory
();
this
.
builder
.
interceptors
(
this
.
interceptor
)
this
.
builder
.
interceptors
(
this
.
interceptor
)
.
messageConverters
(
this
.
messageConverter
).
rootUri
(
"http://localhost:8080"
)
.
messageConverters
(
this
.
messageConverter
).
rootUri
(
"http://localhost:8080"
)
.
errorHandler
(
errorHandler
).
basicAuth
oriz
ation
(
"spring"
,
"boot"
)
.
errorHandler
(
errorHandler
).
basicAuth
entic
ation
(
"spring"
,
"boot"
)
.
requestFactory
(()
->
requestFactory
).
customizers
((
restTemplate
)
->
{
.
requestFactory
(()
->
requestFactory
).
customizers
((
restTemplate
)
->
{
assertThat
(
restTemplate
.
getInterceptors
()).
hasSize
(
2
)
assertThat
(
restTemplate
.
getInterceptors
()).
hasSize
(
2
)
.
contains
(
this
.
interceptor
).
anyMatch
(
.
contains
(
this
.
interceptor
).
anyMatch
(
(
ic
)
->
ic
instanceof
BasicAuth
oriz
ationInterceptor
);
(
ic
)
->
ic
instanceof
BasicAuth
entic
ationInterceptor
);
assertThat
(
restTemplate
.
getMessageConverters
())
assertThat
(
restTemplate
.
getMessageConverters
())
.
contains
(
this
.
messageConverter
);
.
contains
(
this
.
messageConverter
);
assertThat
(
restTemplate
.
getUriTemplateHandler
())
assertThat
(
restTemplate
.
getUriTemplateHandler
())
...
...
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