Remove redundant method call

wso2 · Jun 28, 2024 · 7ec32e4 · 7ec32e4
1 parent 0c1943d
commit 7ec32e4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...cer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoAnalyticsProvider.java b/...cer/src/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoAnalyticsProvider.java
@@ -224,8 +224,11 @@ public String getEndUserIP() {
     @Override
     public Map<String, Object> getProperties() {
         AnalyticsCustomDataProvider customDataProvider = AnalyticsFilter.getAnalyticsCustomDataProvider();
-        if (customDataProvider != null && customDataProvider.getCustomProperties(customProperties) != null) {
-            return customDataProvider.getCustomProperties(customProperties);
+        if (customDataProvider != null) {
+            Map<String, Object> customPropertyMap = customDataProvider.getCustomProperties(customProperties);
+            if (customPropertyMap != null) {
+                return customPropertyMap;
+            }
         }
         return this.customProperties;
     }

diff --git a/...rc/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java b/...rc/main/java/org/wso2/choreo/connect/enforcer/analytics/ChoreoFaultAnalyticsProvider.java
@@ -240,8 +240,11 @@ public String getEndUserIP() {
     @Override
     public Map<String, Object> getProperties() {
         AnalyticsCustomDataProvider customDataProvider = AnalyticsFilter.getAnalyticsCustomDataProvider();
-        if (customDataProvider != null && customDataProvider.getCustomProperties(customProperties) != null) {
-            return customDataProvider.getCustomProperties(customProperties);
+        if (customDataProvider != null) {
+            Map<String, Object> customPropertyMap = customDataProvider.getCustomProperties(customProperties);
+            if (customPropertyMap != null) {
+                return customPropertyMap;
+            }
         }
         return this.customProperties;
     }