Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary boxing for integers.

Browse Source 
Resolves #1334.
This commit is contained in:
hduelme
2023-02-11 21:45:12 +01:00
committed by Greg L. Turnquist
parent 72d542993d
commit 0a5a42368e
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-ws-core/src/main/java/org/springframework/ws/transport/http/LocationTransformerObjectSupport.java
View File

@@ -87,8 +87,16 @@ public abstract class LocationTransformerObjectSupport extends TransformerObject
* This method is only called when the {@code transformLocations} property is true.
*/
protected String transformLocation(String location, HttpServletRequest request) {
StringBuilder url = new StringBuilder(request.getScheme());
url.append("://").append(request.getServerName()).append(':').append(request.getServerPort());
String xForwardedProto = request.getHeader("X-Forwarded-Proto");
String xForwardedHost = request.getHeader("X-Forwarded-Host");
String xForwardedPort = request.getHeader("X-Forwarded-Port");
String scheme = StringUtils.hasText(xForwardedProto) ? xForwardedProto : request.getScheme();
String serverName = StringUtils.hasText(xForwardedHost) ? xForwardedHost : request.getServerName();
int serverPort = StringUtils.hasText(xForwardedPort) ? Integer.parseInt(xForwardedPort) : request.getServerPort();
StringBuilder url = new StringBuilder(scheme);
url.append("://").append(serverName).append(':').append(serverPort);
if (location.startsWith("/")) {
// a relative path, prepend the context path
url.append(request.getContextPath()).append(location);

2
spring-ws-core/src/test/java/org/springframework/ws/server/endpoint/adapter/DefaultMethodEndpointAdapterTest.java
View File

@@ -142,7 +142,7 @@ public class DefaultMethodEndpointAdapterTest {
expect(argumentResolver1.supportsParameter(isA(MethodParameter.class))).andReturn(false);
expect(argumentResolver2.supportsParameter(isA(MethodParameter.class))).andReturn(true);
expect(argumentResolver2.resolveArgument(eq(messageContext), isA(MethodParameter.class)))
.andReturn(new Integer(42));
.andReturn(42);
expect(returnValueHandler.supportsReturnType(isA(MethodParameter.class))).andReturn(true);
returnValueHandler.handleReturnValue(eq(messageContext), isA(MethodParameter.class), eq(value));