File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed
spring-core/src/main/java/org/springframework/core
spring-web/src/main/java/org/springframework/http/client Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -976,8 +976,7 @@ public String toString() {
976
976
if (this .resolved == null ) {
977
977
return "?" ;
978
978
}
979
- if (this .type instanceof TypeVariable ) {
980
- TypeVariable <?> variable = (TypeVariable <?>) this .type ;
979
+ if (this .type instanceof TypeVariable <?> variable ) {
981
980
if (this .variableResolver == null || this .variableResolver .resolveVariable (variable ) == null ) {
982
981
// Don't bother with variable boundaries for toString()...
983
982
// Can cause infinite recursions in case of self-references
Original file line number Diff line number Diff line change @@ -59,6 +59,7 @@ final class HttpComponentsClientHttpRequest extends AbstractBufferingClientHttpR
59
59
this .httpContext = context ;
60
60
}
61
61
62
+
62
63
@ Override
63
64
public HttpMethod getMethod () {
64
65
return HttpMethod .valueOf (this .httpRequest .getMethod ());
Original file line number Diff line number Diff line change 1
1
/*
2
- * Copyright 2002-2020 the original author or authors.
2
+ * Copyright 2002-2021 the original author or authors.
3
3
*
4
4
* Licensed under the Apache License, Version 2.0 (the "License");
5
5
* you may not use this file except in compliance with the License.
39
39
import org .springframework .core .io .buffer .DataBufferFactory ;
40
40
import org .springframework .http .HttpHeaders ;
41
41
import org .springframework .http .HttpMethod ;
42
+ import org .springframework .http .MediaType ;
42
43
import org .springframework .lang .Nullable ;
43
44
44
- import static org .springframework .http .MediaType .ALL_VALUE ;
45
-
46
45
/**
47
46
* {@link ClientHttpRequest} implementation for the Apache HttpComponents HttpClient 5.x.
47
+ *
48
48
* @author Martin Tarjányi
49
49
* @author Arjen Poutsma
50
50
* @since 5.3
@@ -125,7 +125,7 @@ protected void applyHeaders() {
125
125
.forEach (entry -> entry .getValue ().forEach (v -> this .httpRequest .addHeader (entry .getKey (), v )));
126
126
127
127
if (!this .httpRequest .containsHeader (HttpHeaders .ACCEPT )) {
128
- this .httpRequest .addHeader (HttpHeaders .ACCEPT , ALL_VALUE );
128
+ this .httpRequest .addHeader (HttpHeaders .ACCEPT , MediaType . ALL_VALUE );
129
129
}
130
130
}
131
131
You can’t perform that action at this time.
0 commit comments