From 669742db569c0ff0d3175768a9f07931548b74ec Mon Sep 17 00:00:00 2001 From: stsypanov Date: Thu, 19 Dec 2019 18:14:49 +0200 Subject: [PATCH] Trim line from LineInfo only once --- .../resource/AppCacheManifestTransformer.java | 11 ++++++----- .../servlet/resource/AppCacheManifestTransformer.java | 11 ++++++----- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java index 58ea4ab7fccb..e6d2d56a580e 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/resource/AppCacheManifestTransformer.java @@ -68,13 +68,13 @@ */ public class AppCacheManifestTransformer extends ResourceTransformerSupport { - private static final Collection MANIFEST_SECTION_HEADERS = - Arrays.asList("CACHE MANIFEST", "NETWORK:", "FALLBACK:", "CACHE:"); - private static final String MANIFEST_HEADER = "CACHE MANIFEST"; private static final String CACHE_HEADER = "CACHE:"; + private static final Collection MANIFEST_SECTION_HEADERS = + Arrays.asList(MANIFEST_HEADER, "NETWORK:", "FALLBACK:", CACHE_HEADER); + private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8; private static final Log logger = LogFactory.getLog(AppCacheManifestTransformer.class); @@ -212,8 +212,9 @@ private static class LineInfo { private static boolean initCacheSectionFlag(String line, @Nullable LineInfo previousLine) { - if (MANIFEST_SECTION_HEADERS.contains(line.trim())) { - return line.trim().equals(CACHE_HEADER); + String trimmedLine = line.trim(); + if (MANIFEST_SECTION_HEADERS.contains(trimmedLine)) { + return trimmedLine.equals(CACHE_HEADER); } else if (previousLine != null) { return previousLine.isCacheSection(); diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java index 8868b5c54f0d..fb3bdd0b30c5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AppCacheManifestTransformer.java @@ -65,13 +65,13 @@ */ public class AppCacheManifestTransformer extends ResourceTransformerSupport { - private static final Collection MANIFEST_SECTION_HEADERS = - Arrays.asList("CACHE MANIFEST", "NETWORK:", "FALLBACK:", "CACHE:"); - private static final String MANIFEST_HEADER = "CACHE MANIFEST"; private static final String CACHE_HEADER = "CACHE:"; + private static final Collection MANIFEST_SECTION_HEADERS = + Arrays.asList(MANIFEST_HEADER, "NETWORK:", "FALLBACK:", CACHE_HEADER); + private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8; private static final Log logger = LogFactory.getLog(AppCacheManifestTransformer.class); @@ -168,8 +168,9 @@ public LineInfo(String line, @Nullable LineInfo previous) { } private static boolean initCacheSectionFlag(String line, @Nullable LineInfo previousLine) { - if (MANIFEST_SECTION_HEADERS.contains(line.trim())) { - return line.trim().equals(CACHE_HEADER); + String trimmedLine = line.trim(); + if (MANIFEST_SECTION_HEADERS.contains(trimmedLine)) { + return trimmedLine.equals(CACHE_HEADER); } else if (previousLine != null) { return previousLine.isCacheSection();