merge in master

prime-framework · Nov 20, 2024 · 3779dbe · 3779dbe
2 parents 2a23108 + 7030013
commit 3779dbe
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/pom.xml b/pom.xml
@@ -212,4 +212,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
+</project>
diff --git a/src/main/java/org/primeframework/mvc/action/DefaultActionMappingWorkflow.java b/src/main/java/org/primeframework/mvc/action/DefaultActionMappingWorkflow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001-2023, Inversoft Inc., All Rights Reserved
+ * Copyright (c) 2001-2024, Inversoft Inc., All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/primeframework/mvc/config/AbstractMVCConfiguration.java b/src/main/java/org/primeframework/mvc/config/AbstractMVCConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2023, Inversoft Inc., All Rights Reserved
+ * Copyright (c) 2012-2024, Inversoft Inc., All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/main/java/org/primeframework/mvc/config/MVCConfiguration.java b/src/main/java/org/primeframework/mvc/config/MVCConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2023, Inversoft Inc., All Rights Reserved
+ * Copyright (c) 2012-2024, Inversoft Inc., All Rights Reserved
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/src/test/java/org/primeframework/mvc/GlobalTest.java b/src/test/java/org/primeframework/mvc/GlobalTest.java
@@ -77,6 +77,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertFalse;
 import static org.testng.FileAssert.fail;
 
 /**
@@ -1176,6 +1177,16 @@ public void get_unknownParameters() throws Exception {
                                  ));
   }
 
+  @Test
+  public void get_url_rewrite() {
+    simulator.test("/doesNotExist?__a_foo=/user/edit&foo=true")
+             .get()
+             .assertStatusCode(404)
+             .assertContainsNoFieldMessages()
+             .assertBodyContains("The page is missing!");
+    assertFalse(EditAction.getCalled);
+  }
+
   @Test
   public void get_wellKnownDotPrefixed() throws Exception {
     test.simulate(() -> simulator.test("/.well-known/openid-configuration")