From a2af5a90dc14217b02246b2d733f9c4d25b17600 Mon Sep 17 00:00:00 2001 From: Hyunjin Choi Date: Fri, 24 Jan 2020 19:39:05 +0900 Subject: [PATCH] Simplify UrlFileNameViewController#getViewNameForUrlPath() Closes gh-24419 --- .../web/servlet/mvc/UrlFilenameViewController.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java index e037a817b8d..31495ada512 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/UrlFilenameViewController.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2020 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. @@ -125,13 +125,7 @@ public class UrlFilenameViewController extends AbstractUrlViewController { * @see #postProcessViewName */ protected String getViewNameForUrlPath(String uri) { - String viewName = this.viewNameCache.get(uri); - if (viewName == null) { - viewName = extractViewNameFromUrlPath(uri); - viewName = postProcessViewName(viewName); - this.viewNameCache.put(uri, viewName); - } - return viewName; + return this.viewNameCache.computeIfAbsent(uri, u -> postProcessViewName(extractViewNameFromUrlPath(u))); } /**