From 29361833675dad5416bd184cb0003d063ce58e27 Mon Sep 17 00:00:00 2001
From: Manfred Riem <mriem@manorrock.com>
Date: Mon, 6 Jan 2025 16:40:33 -0600
Subject: [PATCH] Fixes #4466 - Add logging to
 HttpWebApplicationServerRequestMapper for debugging purposes (#4480)

---
 external/webprofile-tck/pom.xml               | 28 -----------
 ...HttpWebApplicationServerRequestMapper.java | 49 ++++++++++++++++---
 2 files changed, 43 insertions(+), 34 deletions(-)
 delete mode 100644 external/webprofile-tck/pom.xml

diff --git a/external/webprofile-tck/pom.xml b/external/webprofile-tck/pom.xml
deleted file mode 100644
index 5f60e7163..000000000
--- a/external/webprofile-tck/pom.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project 
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-    xmlns:if="ant:if">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>cloud.piranha.external</groupId>
-        <artifactId>project</artifactId>
-        <version>25.1.0-SNAPSHOT</version>
-    </parent>
-    <groupId>cloud.piranha.external.webprofiletck</groupId>
-    <artifactId>project</artifactId>
-    <packaging>pom</packaging>
-    <name>Piranha - External - Web Profile TCK - Project</name>
-    <properties>
-        <inject.tck.version>2.0.2</inject.tck.version>
-        <cdi.tck.version>4.0.13</cdi.tck.version>
-    </properties>
-    <modules>
-        <module>atinject</module>
-        <module>cdi</module>
-        <module>jsonb</module>
-        <module>jsonp</module>
-    </modules>
-</project>
diff --git a/http/webapp/src/main/java/cloud/piranha/http/webapp/HttpWebApplicationServerRequestMapper.java b/http/webapp/src/main/java/cloud/piranha/http/webapp/HttpWebApplicationServerRequestMapper.java
index 559aa3279..498c63d0d 100644
--- a/http/webapp/src/main/java/cloud/piranha/http/webapp/HttpWebApplicationServerRequestMapper.java
+++ b/http/webapp/src/main/java/cloud/piranha/http/webapp/HttpWebApplicationServerRequestMapper.java
@@ -27,25 +27,39 @@
  */
 package cloud.piranha.http.webapp;
 
+import cloud.piranha.core.api.WebApplication;
+import cloud.piranha.core.api.WebApplicationServerRequestMapper;
+import java.lang.System.Logger;
+import static java.lang.System.Logger.Level.TRACE;
 import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
-import cloud.piranha.core.api.WebApplication;
-import cloud.piranha.core.api.WebApplicationServerRequestMapper;
-
 /**
- * The default WebApplicationServerRequestMapper.
+ * The HTTP WebApplicationServerRequestMapper.
  *
  * @author Manfred Riem (mriem@manorrock.com)
  */
 public class HttpWebApplicationServerRequestMapper implements WebApplicationServerRequestMapper {
 
     /**
-     * Stores the mappings.
+     * Stores the logger.
      */
-    private final ConcurrentHashMap<String, WebApplication> mappings = new ConcurrentHashMap<>();
+    private static final Logger LOGGER
+            = System.getLogger(HttpWebApplicationServerRequestMapper.class.getName());
+
+    /**
+     * Stores the web application mappings.
+     */
+    private final ConcurrentHashMap<String, WebApplication> mappings;
+
+    /**
+     * Constructor.
+     */
+    public HttpWebApplicationServerRequestMapper() {
+        this.mappings = new ConcurrentHashMap<>();
+    }
 
     /**
      * Add a mapping.
@@ -62,6 +76,9 @@ public Set<String> addMapping(WebApplication webApplication, String... urlPatter
             if (this.mappings.containsKey(urlPattern)) {
                 result.add(urlPattern);
             } else {
+                if (LOGGER.isLoggable(TRACE)) {
+                    LOGGER.log(TRACE, "Adding url pattern: %s", urlPattern);
+                }
                 this.mappings.put(urlPattern, webApplication);
             }
         }
@@ -77,11 +94,21 @@ public Set<String> addMapping(WebApplication webApplication, String... urlPatter
      */
     @Override
     public WebApplication findMapping(String path) {
+        if (LOGGER.isLoggable(TRACE)) {
+            LOGGER.log(TRACE, "Finding web application for: %s", path);
+        }
         WebApplication result = null;
         String mapping = findPrefixMatch(path);
         if (mapping != null) {
             result = this.mappings.get(mapping);
         }
+        if (LOGGER.isLoggable(TRACE)) {
+            if (result != null) {
+                LOGGER.log(TRACE, "Found web application at: %s", result.getContextPath());
+            } else {
+                LOGGER.log(TRACE, "Unable to find web application for: %s", path);
+            }
+        }
         return result;
     }
 
@@ -92,6 +119,9 @@ public WebApplication findMapping(String path) {
      * @return the mapping, or null if not found.
      */
     private String findPrefixMatch(String path) {
+        if (LOGGER.isLoggable(TRACE)) {
+            LOGGER.log(TRACE, "Find prefix for: %s", path);
+        }
         String result = null;
         String found;
 
@@ -104,6 +134,13 @@ private String findPrefixMatch(String path) {
             }
         }
 
+        if (LOGGER.isLoggable(TRACE)) {
+            if (result != null) {
+                LOGGER.log(TRACE, "Found prefix: %s", result);
+            } else {
+                LOGGER.log(TRACE, "Unable to find prefix for: %s", path);
+            }
+        }
         return result;
     }