Merge pull request #6646 from kingthorin/td-maint

tech detection: Make load time human readable & maint

Author: thc202

addOns/wappalyzer/CHANGELOG.md

@@ -4,7 +4,9 @@ All notable changes to this add-on will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## Unreleased
-
+### Changed
+- During load the time taken to process the data files will be shown in human readable format (generally seconds), as well as milliseconds (ms).
+- Maintenance changes.
 
 ## [21.47.0] - 2025-07-15
 ### Changed

addOns/wappalyzer/src/main/java/org/zaproxy/zap/extension/wappalyzer/TechsJsonParser.java

@@ -45,6 +45,7 @@
 import javax.swing.ImageIcon;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+import org.apache.commons.lang3.time.DurationFormatUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jsoup.select.QueryParser;
@@ -103,11 +104,12 @@ TechData parse(String categories, List<String> technologies, boolean createIcons
         // Note: Based on testing having the forEach separate performs faster than chaining it
         futures.forEach(CompletableFuture::join);
         executor.shutdown();
-        Instant finish = Instant.now();
+        long loadTime = Duration.between(start, Instant.now()).toMillis();
         LOGGER.info(
-                "Loaded {} Tech Detection technologies, in {}ms",
+                "Loaded {} Tech Detection technologies, in {} ({}ms)",
                 techData.getApplications().size(),
-                Duration.between(start, finish).toMillis());
+                DurationFormatUtils.formatDurationWords(loadTime, true, true),
+                loadTime);
         return techData;
     }
 
@@ -404,6 +406,9 @@ private List<Map<String, Map<String, Map<String, AppPattern>>>> jsonToAppPattern
                     }
                 }
             }
+        } else if (json instanceof JSONArray) {
+            // DOM Pattern JSONArrays are ignored here
+            // They will be added as Simple DOM Patterns
         } else {
             LOGGER.debug(
                     "Unexpected JSON type for {} pattern: {} {}",