From d6ee3b2eee175024ae5c04935736a1478f76379c Mon Sep 17 00:00:00 2001
From: seregamorph <serega.morph@gmail.com>
Date: Mon, 26 Oct 2020 10:06:29 +0300
Subject: [PATCH] [UNDERTOW-1821] Path template matched should keep order

---
 .../io/undertow/util/PathTemplateMatcher.java |  4 +-
 .../util/PathTemplateMatcherTestCase.java     | 50 +++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 core/src/test/java/io/undertow/util/PathTemplateMatcherTestCase.java

diff --git a/core/src/main/java/io/undertow/util/PathTemplateMatcher.java b/core/src/main/java/io/undertow/util/PathTemplateMatcher.java
index 1a23386ffa..78f7e2257e 100644
--- a/core/src/main/java/io/undertow/util/PathTemplateMatcher.java
+++ b/core/src/main/java/io/undertow/util/PathTemplateMatcher.java
@@ -21,9 +21,9 @@
 import io.undertow.UndertowMessages;
 
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
@@ -51,7 +51,7 @@ public class PathTemplateMatcher<T> {
 
     public PathMatchResult<T> match(final String path) {
         String normalizedPath = "".equals(path) ? "/" : path;
-        final Map<String, String> params = new HashMap<>();
+        final Map<String, String> params = new LinkedHashMap<>();
         int length = normalizedPath.length();
         final int[] lengths = this.lengths;
         for (int i = 0; i < lengths.length; ++i) {
diff --git a/core/src/test/java/io/undertow/util/PathTemplateMatcherTestCase.java b/core/src/test/java/io/undertow/util/PathTemplateMatcherTestCase.java
new file mode 100644
index 0000000000..3a2c845ebc
--- /dev/null
+++ b/core/src/test/java/io/undertow/util/PathTemplateMatcherTestCase.java
@@ -0,0 +1,50 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2020 Red Hat, Inc., and individual contributors
+ * as indicated by the @author tags.
+ *
+ * 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
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+package io.undertow.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import io.undertow.server.HttpHandler;
+import io.undertow.testutils.category.UnitTest;
+import io.undertow.util.PathTemplateMatcher.PathMatchResult;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+@Category(UnitTest.class)
+public class PathTemplateMatcherTestCase {
+
+    @Test
+    public void pathTemplateMatchedShouldKeepOrder() {
+        PathTemplateMatcher<HttpHandler> matcher = new PathTemplateMatcher<>();
+        matcher.add("/{context}/{version}/{entity}/{id}", exchange -> {
+        });
+
+        PathMatchResult<HttpHandler> match = matcher.match("/api/v3/users/1");
+
+        assertNotNull("Not matched", match);
+        assertNotNull("Value", match.getValue());
+        assertEquals("Matched parameters should keep order of definition",
+                Arrays.asList("api", "v3", "users", "1"), new ArrayList<>(match.getParameters().values()));
+    }
+
+}