code cleanup and optimization

newrelic · Aug 10, 2023 · 2529230 · 2529230
1 parent e03ec1c
commit 2529230
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/...he-struts2/src/main/java/com/nr/instrumentation/security/apache/struts2/StrutsHelper.java b/...he-struts2/src/main/java/com/nr/instrumentation/security/apache/struts2/StrutsHelper.java
@@ -12,10 +12,8 @@ public class StrutsHelper {
     private static final String WILDCARD = "*";
     public static void gatherURLMappings(RuntimeConfiguration runtimeConfig) {
         try {
-
             Map<String, Map<String, ActionConfig>> namespaces = runtimeConfig.getActionConfigs();
             for (Map.Entry<String, Map<String, ActionConfig>> namespace : namespaces.entrySet()) {
-
                 String url = namespace.getKey();
                 for (ActionConfig actionConfig : namespace.getValue().values()) {
                     String mapping;

diff --git a/...e-struts2/src/main/java/com/opensymphony/xwork2/config/Configuration_Instrumentation.java b/...e-struts2/src/main/java/com/opensymphony/xwork2/config/Configuration_Instrumentation.java
@@ -8,7 +8,6 @@
 
 @Weave(type = MatchType.Interface, originalName = "com.opensymphony.xwork2.config.Configuration")
 public abstract class Configuration_Instrumentation {
-
     abstract public RuntimeConfiguration getRuntimeConfiguration();
 
     // TODO: Need extract action extension
@@ -17,15 +16,8 @@ public List<PackageProvider> reloadContainer(List<ContainerProvider> containerPr
         try {
             returnVal = Weaver.callOriginal();
         } finally {
-            postProcessing(getRuntimeConfiguration());
+            StrutsHelper.gatherURLMappings(getRuntimeConfiguration());
         }
         return returnVal;
     }
-
-    private static void postProcessing(RuntimeConfiguration runtimeConfiguration) {
-        try {
-            StrutsHelper.gatherURLMappings(runtimeConfiguration);
-        } catch (Throwable ignored) {
-        }
-    }
 }
diff --git a/settings.gradle b/settings.gradle
@@ -135,3 +135,4 @@ include 'instrumentation:jdbc-inet-oranxo'
 include 'instrumentation:jdbc-sybase-6'
 include 'instrumentation:low-priority-instrumentation'
 include 'instrumentation:commons-jxpath'
+include 'instrumentation:apache-struts2'