From 9a20ec928428a41950ec85604008eb9025e67118 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Thu, 28 Jun 2018 18:13:40 +0200 Subject: [PATCH] Polishing --- .../http/ContentDisposition.java | 18 +++++++++--------- .../resource/GzipResourceResolver.java | 16 +++++++--------- .../resource/VersionResourceResolver.java | 13 ++++--------- .../ResponseEntityResultHandler.java | 3 +-- .../servlet/resource/GzipResourceResolver.java | 16 +++++++--------- .../resource/VersionResourceResolver.java | 13 ++++--------- 6 files changed, 32 insertions(+), 47 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java index 279f6de82d..ee4de88a85 100644 --- a/spring-web/src/main/java/org/springframework/http/ContentDisposition.java +++ b/spring-web/src/main/java/org/springframework/http/ContentDisposition.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -177,9 +177,9 @@ public class ContentDisposition { result = 31 * result + ObjectUtils.nullSafeHashCode(this.filename); result = 31 * result + ObjectUtils.nullSafeHashCode(this.charset); result = 31 * result + ObjectUtils.nullSafeHashCode(this.size); - result = 31 * result + (creationDate != null ? creationDate.hashCode() : 0); - result = 31 * result + (modificationDate != null ? modificationDate.hashCode() : 0); - result = 31 * result + (readDate != null ? readDate.hashCode() : 0); + result = 31 * result + (this.creationDate != null ? this.creationDate.hashCode() : 0); + result = 31 * result + (this.modificationDate != null ? this.modificationDate.hashCode() : 0); + result = 31 * result + (this.readDate != null ? this.readDate.hashCode() : 0); return result; } @@ -198,7 +198,7 @@ public class ContentDisposition { sb.append(this.name).append('\"'); } if (this.filename != null) { - if(this.charset == null || StandardCharsets.US_ASCII.equals(this.charset)) { + if (this.charset == null || StandardCharsets.US_ASCII.equals(this.charset)) { sb.append("; filename=\""); sb.append(this.filename).append('\"'); } @@ -441,12 +441,12 @@ public class ContentDisposition { public interface Builder { /** - * Set the value of the {@literal name} parameter + * Set the value of the {@literal name} parameter. */ Builder name(String name); /** - * Set the value of the {@literal filename} parameter + * Set the value of the {@literal filename} parameter. */ Builder filename(String filename); @@ -463,7 +463,7 @@ public class ContentDisposition { Builder filename(String filename, Charset charset); /** - * Set the value of the {@literal size} parameter + * Set the value of the {@literal size} parameter. */ Builder size(Long size); @@ -483,7 +483,7 @@ public class ContentDisposition { Builder readDate(ZonedDateTime readDate); /** - * Build the content disposition + * Build the content disposition. */ ContentDisposition build(); } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java index 423e1d1565..a615b5a9d7 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/GzipResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -57,7 +57,7 @@ public class GzipResourceResolver extends AbstractResourceResolver { } } catch (IOException ex) { - logger.trace("No gzipped resource for [" + resource.getFilename() + "]", ex); + logger.trace("No gzip resource for [" + resource.getFilename() + "]", ex); } } return resource; @@ -77,6 +77,9 @@ public class GzipResourceResolver extends AbstractResourceResolver { } + /** + * A gzipped {@link HttpResource}. + */ static final class GzippedResource extends AbstractResource implements HttpResource { private final Resource original; @@ -156,13 +159,8 @@ public class GzipResourceResolver extends AbstractResourceResolver { @Override public HttpHeaders getResponseHeaders() { - HttpHeaders headers; - if(this.original instanceof HttpResource) { - headers = ((HttpResource) this.original).getResponseHeaders(); - } - else { - headers = new HttpHeaders(); - } + HttpHeaders headers = (this.original instanceof HttpResource ? + ((HttpResource) this.original).getResponseHeaders() : new HttpHeaders()); headers.add(HttpHeaders.CONTENT_ENCODING, "gzip"); return headers; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java index 03094a5634..0cda69117e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java @@ -323,23 +323,18 @@ public class VersionResourceResolver extends AbstractResourceResolver { @Override public String getDescription() { - return original.getDescription(); + return this.original.getDescription(); } @Override public InputStream getInputStream() throws IOException { - return original.getInputStream(); + return this.original.getInputStream(); } @Override public HttpHeaders getResponseHeaders() { - HttpHeaders headers; - if(this.original instanceof HttpResource) { - headers = ((HttpResource) this.original).getResponseHeaders(); - } - else { - headers = new HttpHeaders(); - } + HttpHeaders headers = (this.original instanceof HttpResource ? + ((HttpResource) this.original).getResponseHeaders() : new HttpHeaders()); headers.setETag("\"" + this.version + "\""); return headers; } diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java index 7999fc1db8..f581ab295e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/ResponseEntityResultHandler.java @@ -153,14 +153,13 @@ public class ResponseEntityResultHandler extends AbstractMessageWriterResultHand HttpHeaders entityHeaders = httpEntity.getHeaders(); HttpHeaders responseHeaders = exchange.getResponse().getHeaders(); - if (!entityHeaders.isEmpty()) { entityHeaders.entrySet().stream() .filter(entry -> !responseHeaders.containsKey(entry.getKey())) .forEach(entry -> responseHeaders.put(entry.getKey(), entry.getValue())); } - if(httpEntity.getBody() == null || returnValue instanceof HttpHeaders) { + if (httpEntity.getBody() == null || returnValue instanceof HttpHeaders) { return exchange.getResponse().setComplete(); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java index 85257bf685..ce8807b86f 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/GzipResourceResolver.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -59,7 +59,7 @@ public class GzipResourceResolver extends AbstractResourceResolver { } } catch (IOException ex) { - logger.trace("No gzipped resource for [" + resource.getFilename() + "]", ex); + logger.trace("No gzip resource for [" + resource.getFilename() + "]", ex); } return resource; @@ -78,6 +78,9 @@ public class GzipResourceResolver extends AbstractResourceResolver { } + /** + * A gzipped {@link HttpResource}. + */ static final class GzippedResource extends AbstractResource implements HttpResource { private final Resource original; @@ -157,13 +160,8 @@ public class GzipResourceResolver extends AbstractResourceResolver { @Override public HttpHeaders getResponseHeaders() { - HttpHeaders headers; - if (this.original instanceof HttpResource) { - headers = ((HttpResource) this.original).getResponseHeaders(); - } - else { - headers = new HttpHeaders(); - } + HttpHeaders headers = (this.original instanceof HttpResource ? + ((HttpResource) this.original).getResponseHeaders() : new HttpHeaders()); headers.add(HttpHeaders.CONTENT_ENCODING, "gzip"); return headers; } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java index 0e48ec9741..2cd4003e8d 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java @@ -316,23 +316,18 @@ public class VersionResourceResolver extends AbstractResourceResolver { @Override public String getDescription() { - return original.getDescription(); + return this.original.getDescription(); } @Override public InputStream getInputStream() throws IOException { - return original.getInputStream(); + return this.original.getInputStream(); } @Override public HttpHeaders getResponseHeaders() { - HttpHeaders headers; - if (this.original instanceof HttpResource) { - headers = ((HttpResource) this.original).getResponseHeaders(); - } - else { - headers = new HttpHeaders(); - } + HttpHeaders headers = (this.original instanceof HttpResource ? + ((HttpResource) this.original).getResponseHeaders() : new HttpHeaders()); headers.setETag("\"" + this.version + "\""); return headers; }