UriUtils.extractFileExtension properly handles all fragments

Issue: SPR-15786
(cherry picked from commit 13080f0)

Author: jhoeller

spring-web/src/main/java/org/springframework/web/util/UriUtils.java

@@ -222,11 +222,12 @@ public static String decode(String source, String encoding) throws UnsupportedEn
 	 */
 	public static String extractFileExtension(String path) {
 		int end = path.indexOf('?');
+		int fragmentIndex = path.indexOf('#');
+		if (fragmentIndex != -1 && (end == -1 || fragmentIndex < end)) {
+			end = fragmentIndex;
+		}
 		if (end == -1) {
-			end = path.indexOf('#');
-			if (end == -1) {
-				end = path.length();
-			}
+			end = path.length();
 		}
 		int begin = path.lastIndexOf('/', end) + 1;
 		int paramIndex = path.indexOf(';', begin);

spring-web/src/test/java/org/springframework/web/util/UriUtilsTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -25,6 +25,7 @@
 /**
  * @author Arjen Poutsma
  * @author Juergen Hoeller
+ * @author Med Belamachi
  */
 public class UriUtilsTests {
 
@@ -113,6 +114,8 @@ public void extractFileExtension() {
 		assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/a"));
 		assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/path/a"));
 		assertEquals("html", UriUtils.extractFileExtension("/products/view.html#/path/a.do"));
+		assertEquals("html", UriUtils.extractFileExtension("/products/view.html#aaa?bbb"));
+		assertEquals("html", UriUtils.extractFileExtension("/products/view.html#aaa.xml?bbb"));
 		assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=a"));
 		assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=/path/a"));
 		assertEquals("html", UriUtils.extractFileExtension("/products/view.html?param=/path/a.do"));