Polishing

spring-web/src/main/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolver.java

@@ -95,13 +95,11 @@ public class MappingMediaTypeFileExtensionResolver implements MediaTypeFileExten
 	}
 
 	/**
-	 * Use this method for a reverse, case-insensitive MediaType lookup.
-	 * @param extension the extension to look up
-	 * @return a MediaType for the key or {@code null}
+	 * Use this method for a reverse lookup from extension to MediaType.
+	 * @return a MediaType for the key, or {@code null} if none found
 	 */
 	protected MediaType lookupMediaType(String extension) {
-		extension = extension.toLowerCase(Locale.ENGLISH);
-		return this.mediaTypes.get(extension);
+		return this.mediaTypes.get(extension.toLowerCase(Locale.ENGLISH));
 	}
 
 }

spring-web/src/test/java/org/springframework/web/accept/MappingMediaTypeFileExtensionResolverTests.java

@@ -29,6 +29,7 @@ import static org.junit.Assert.*;
  * Test fixture for {@link MappingMediaTypeFileExtensionResolver}.
  *
  * @author Rossen Stoyanchev
+ * @author Melissa Hartsock
  */
 public class MappingMediaTypeFileExtensionResolverTests {
 
@@ -51,8 +52,10 @@ public class MappingMediaTypeFileExtensionResolverTests {
 		assertTrue(extensions.isEmpty());
 	}
 
-	// SPR-13747
-
+	/**
+	 * Unit test for SPR-13747 - ensures that reverse lookup of media type from media
+	 * type key is case-insensitive.
+	 */
 	@Test
 	public void lookupMediaTypeCaseInsensitive() {
 		Map<String, MediaType> mapping = Collections.singletonMap("json", MediaType.APPLICATION_JSON);
@@ -61,4 +64,5 @@ public class MappingMediaTypeFileExtensionResolverTests {
 
 		assertEquals(mediaType, MediaType.APPLICATION_JSON);
 	}
+
 }

spring-webmvc/src/main/java/org/springframework/web/servlet/resource/AbstractVersionStrategy.java

 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -100,11 +100,12 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
 
 		@Override
 		public String addVersion(String path, String version) {
-			if(path.startsWith(".")) {
+			if (path.startsWith(".")) {
 				return path;
 			}
 			else {
-				return (this.prefix.endsWith("/") || path.startsWith("/") ? this.prefix + path : this.prefix + "/" + path);
+				return (this.prefix.endsWith("/") || path.startsWith("/") ?
+						this.prefix + path : this.prefix + "/" + path);
 			}
 		}
 	}
@@ -123,7 +124,7 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
 			Matcher matcher = pattern.matcher(requestPath);
 			if (matcher.find()) {
 				String match = matcher.group(1);
-				return match.contains("-") ? match.substring(match.lastIndexOf("-") + 1) : match;
+				return (match.contains("-") ? match.substring(match.lastIndexOf("-") + 1) : match);
 			}
 			else {
 				return null;
@@ -139,7 +140,7 @@ public abstract class AbstractVersionStrategy implements VersionStrategy {
 		public String addVersion(String requestPath, String version) {
 			String baseFilename = StringUtils.stripFilenameExtension(requestPath);
 			String extension = StringUtils.getFilenameExtension(requestPath);
-			return baseFilename + "-" + version + "." + extension;
+			return (baseFilename + "-" + version + "." + extension);
 		}
 	}
 

spring-webmvc/src/test/java/org/springframework/web/servlet/resource/FixedVersionStrategyTests.java

 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
  * You may obtain a copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.springframework.web.servlet.resource;
 
 import org.junit.Before;
@@ -21,7 +22,8 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
- * Unit tests for {@link org.springframework.web.servlet.resource.FixedVersionStrategy}
+ * Unit tests for {@link org.springframework.web.servlet.resource.FixedVersionStrategy}.
+ *
  * @author Brian Clozel
  */
 public class FixedVersionStrategyTests {
@@ -60,8 +62,7 @@ public class FixedVersionStrategyTests {
 		assertEquals(this.version + "/" + this.path, this.strategy.addVersion("/" + this.path, this.version));
 	}
 
-	// SPR-13727
-	@Test
+	@Test  // SPR-13727
 	public void addVersionRelativePath() throws Exception {
 		String relativePath = "../" + this.path;
 		assertEquals(relativePath, this.strategy.addVersion(relativePath, this.version));