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

Use new Java features (switch expressions, text blocks, new JDK methods)

Browse Source 
Closes gh-29747
This commit is contained in:
Krzysztof Krason
2022-12-28 08:59:08 +01:00
committed by Sam Brannen
parent 48abd493fe
commit afb8a0d1b1
53 changed files with 498 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
spring-web/src/main/java/org/springframework/web/client/HttpServerErrorException.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -97,32 +97,26 @@ public class HttpServerErrorException extends HttpStatusCodeException {
String statusText, HttpHeaders headers, byte[] body, @Nullable Charset charset) {
if (statusCode instanceof HttpStatus status) {
switch (status) {
case INTERNAL_SERVER_ERROR:
return message != null ?
new HttpServerErrorException.InternalServerError(message, statusText, headers, body, charset) :
new HttpServerErrorException.InternalServerError(statusText, headers, body, charset);
case NOT_IMPLEMENTED:
return message != null ?
new HttpServerErrorException.NotImplemented(message, statusText, headers, body, charset) :
new HttpServerErrorException.NotImplemented(statusText, headers, body, charset);
case BAD_GATEWAY:
return message != null ?
new HttpServerErrorException.BadGateway(message, statusText, headers, body, charset) :
new HttpServerErrorException.BadGateway(statusText, headers, body, charset);
case SERVICE_UNAVAILABLE:
return message != null ?
new HttpServerErrorException.ServiceUnavailable(message, statusText, headers, body, charset) :
new HttpServerErrorException.ServiceUnavailable(statusText, headers, body, charset);
case GATEWAY_TIMEOUT:
return message != null ?
new HttpServerErrorException.GatewayTimeout(message, statusText, headers, body, charset) :
new HttpServerErrorException.GatewayTimeout(statusText, headers, body, charset);
default:
return message != null ?
new HttpServerErrorException(message, statusCode, statusText, headers, body, charset) :
new HttpServerErrorException(statusCode, statusText, headers, body, charset);
}
return switch (status) {
case INTERNAL_SERVER_ERROR -> message != null ?
new InternalServerError(message, statusText, headers, body, charset) :
new InternalServerError(statusText, headers, body, charset);
case NOT_IMPLEMENTED -> message != null ?
new NotImplemented(message, statusText, headers, body, charset) :
new NotImplemented(statusText, headers, body, charset);
case BAD_GATEWAY -> message != null ?
new BadGateway(message, statusText, headers, body, charset) :
new BadGateway(statusText, headers, body, charset);
case SERVICE_UNAVAILABLE -> message != null ?
new ServiceUnavailable(message, statusText, headers, body, charset) :
new ServiceUnavailable(statusText, headers, body, charset);
case GATEWAY_TIMEOUT -> message != null ?
new GatewayTimeout(message, statusText, headers, body, charset) :
new GatewayTimeout(statusText, headers, body, charset);
default -> message != null ?
new HttpServerErrorException(message, statusCode, statusText, headers, body, charset) :
new HttpServerErrorException(statusCode, statusText, headers, body, charset);
};
}
if (message != null) {
return new HttpServerErrorException(message, statusCode, statusText, headers, body, charset);

12
spring-web/src/main/java/org/springframework/web/cors/CorsConfiguration.java
View File

@@ -263,18 +263,14 @@ public class CorsConfiguration {
boolean withinPortRange = false;
for (int current = 0; current < rawValue.length(); current++) {
switch (rawValue.charAt(current)) {
case '[':
withinPortRange = true;
break;
case ']':
withinPortRange = false;
break;
case ',':
case '[' -> withinPortRange = true;
case ']' -> withinPortRange = false;
case ',' -> {
if (!withinPortRange) {
valueConsumer.accept(rawValue.substring(start, current).trim());
start = current + 1;
}
break;
}
}
}
if (start < rawValue.length()) {