From 3fee8cb62502eaede7edd65f9435feeb823352c3 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 26 Oct 2018 11:43:46 +0200 Subject: [PATCH] Polishing --- .../web/reactive/resource/ResourceTransformerSupport.java | 4 ++-- .../web/servlet/resource/ResourceTransformerSupport.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java index 63c096d9707..d778fb07eb7 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/ResourceTransformerSupport.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. @@ -96,7 +96,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer */ protected String toAbsolutePath(String path, ServerWebExchange exchange) { String requestPath = exchange.getRequest().getURI().getPath(); - String absolutePath = path.startsWith("/") ? path : StringUtils.applyRelativePath(requestPath, path); + String absolutePath = (path.startsWith("/") ? path : StringUtils.applyRelativePath(requestPath, path)); return StringUtils.cleanPath(absolutePath); } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java index 98ec607d5d9..1a3936ec215 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/ResourceTransformerSupport.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. @@ -95,7 +95,7 @@ public abstract class ResourceTransformerSupport implements ResourceTransformer */ protected String toAbsolutePath(String path, HttpServletRequest request) { String absolutePath = path; - if(!path.startsWith("/")) { + if (!path.startsWith("/")) { ResourceUrlProvider urlProvider = findResourceUrlProvider(request); Assert.state(urlProvider != null, "No ResourceUrlProvider"); String requestPath = urlProvider.getUrlPathHelper().getRequestUri(request);