From 9e698721258abaf5b7da465f9696bcc00a5e42bb Mon Sep 17 00:00:00 2001
From: Dele Taylor <dele.taylor@northconcepts.com>
Date: Tue, 16 Sep 2025 08:57:12 -0400
Subject: [PATCH] DP-5194 remove query params from string returned from
 HttpServletRequest.getRequestURL() when creating a Url instance

---
 .gitignore                                    |  1 +
 article-submission-example/build.gradle       |  2 +-
 forms-example/build.gradle                    |  2 +-
 library/build.gradle                          |  7 ++---
 library/gradle.properties                     |  2 +-
 .../templatemaster/content/Util.java          | 26 +++++++++++++++++++
 .../templatemaster/rest/Url.java              |  1 +
 7 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index d054c8a..34e6c7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 library/build_release.cmd
+library/temp/
diff --git a/article-submission-example/build.gradle b/article-submission-example/build.gradle
index fce8665..66c3b1b 100644
--- a/article-submission-example/build.gradle
+++ b/article-submission-example/build.gradle
@@ -25,7 +25,7 @@ dependencies {
    
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
     
-    implementation 'com.northconcepts:northconcepts-templatemaster:3.0.0'
+    implementation 'com.northconcepts:northconcepts-templatemaster:3.0.2'
     implementation 'org.springframework.data:spring-data-commons:2.1.2.RELEASE'
    
     //compile fileTree(dir: 'lib', include: ['*.jar'])
diff --git a/forms-example/build.gradle b/forms-example/build.gradle
index df2fd98..4813c67 100644
--- a/forms-example/build.gradle
+++ b/forms-example/build.gradle
@@ -15,7 +15,7 @@ dependencies {
     implementation 'org.jboss.resteasy:resteasy-jackson2-provider:6.2.8.Final'
     implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.7'
 
-    implementation 'com.northconcepts:northconcepts-templatemaster:3.0.0'
+    implementation 'com.northconcepts:northconcepts-templatemaster:3.0.2'
     implementation 'org.springframework.data:spring-data-commons:2.1.2.RELEASE'
     implementation 'org.apache.commons:commons-text:1.12.0'
 
diff --git a/library/build.gradle b/library/build.gradle
index 190b0a4..f5dbed8 100644
--- a/library/build.gradle
+++ b/library/build.gradle
@@ -4,14 +4,15 @@ plugins {
     id 'maven-publish'
 }
 
-sourceCompatibility = 11
-targetCompatibility = 11
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
 archivesBaseName='NorthConcepts-TemplateMaster'.toLowerCase()
 
 repositories {
     mavenLocal()
-    jcenter()
+    mavenCentral()
+    gradlePluginPortal()
 }
 
 compileJava {
diff --git a/library/gradle.properties b/library/gradle.properties
index 84d5af9..758abd0 100644
--- a/library/gradle.properties
+++ b/library/gradle.properties
@@ -1 +1 @@
-version=3.0.3
+version=3.0.4
diff --git a/library/src/main/java/com/northconcepts/templatemaster/content/Util.java b/library/src/main/java/com/northconcepts/templatemaster/content/Util.java
index b3f2a60..bacc52a 100644
--- a/library/src/main/java/com/northconcepts/templatemaster/content/Util.java
+++ b/library/src/main/java/com/northconcepts/templatemaster/content/Util.java
@@ -98,6 +98,32 @@ public static String trimRight(String string, char padChar) {
         return (length < string.length()) ? string.substring(0, length) : string;
     }
 
+    public static String trimTo(String string, String substring) {
+        if (isEmpty(string) || isEmpty(substring)) {
+            return string;
+        }
+
+        int index = string.indexOf(substring);
+        if (index >= 0) {
+            string = string.substring(index+substring.length());
+        }
+
+        return string;
+    }
+
+    public static String trimFrom(String string, String substring) {
+        if (isEmpty(string) || isEmpty(substring)) {
+            return string;
+        }
+
+        int index = string.indexOf(substring);
+        if (index >= 0) {
+            string = string.substring(0, index);
+        }
+
+        return string;
+    }
+
     public static boolean matches(String s1, String s2, boolean caseSensitive, boolean allowEmpty) {
         if (!allowEmpty && (isEmpty(s1) || isEmpty(s2))) {
             return false;
diff --git a/library/src/main/java/com/northconcepts/templatemaster/rest/Url.java b/library/src/main/java/com/northconcepts/templatemaster/rest/Url.java
index b330642..a8b73df 100644
--- a/library/src/main/java/com/northconcepts/templatemaster/rest/Url.java
+++ b/library/src/main/java/com/northconcepts/templatemaster/rest/Url.java
@@ -53,6 +53,7 @@ public Url(String uri) {
     public Url(HttpServletRequest request) {
         String s = request.getRequestURL().toString();
         if (Util.isNotEmpty(request.getQueryString())) {
+            s = Util.trimFrom(s, "?");
             s += "?" + request.getQueryString();
         }