Refactor 'collectAndFilterEnvIfNeeded' func (#721)

Author: Or-Geva

build-info-extractor-gradle/src/main/groovy/org/jfrog/gradle/plugin/artifactory/extractor/GradleBuildInfoExtractor.java

@@ -177,7 +177,7 @@ public BuildInfo extract(Project rootProject) {
         }
 
         BuildInfo buildInfo = bib.build();
-        PackageManagerUtils.collectAndFilterEnvIfNeeded(clientConf, buildInfo);
+        PackageManagerUtils.collectEnvAndFilterProperties(clientConf, buildInfo);
         log.debug("buildInfoBuilder = " + buildInfo);
 
         return buildInfo;

build-info-extractor-ivy/src/main/java/org/jfrog/build/extractor/listener/ArtifactoryBuildListener.java

@@ -348,7 +348,7 @@ private void doDeploy(BuildEvent event) {
         }
 
         BuildInfo buildInfo = builder.build();
-        PackageManagerUtils.collectAndFilterEnvIfNeeded(clientConf, buildInfo);
+        PackageManagerUtils.collectEnvAndFilterProperties(clientConf, buildInfo);
         String contextUrl = clientConf.publisher.getContextUrl();
         String username = clientConf.publisher.getUsername();
         String password = clientConf.publisher.getPassword();

build-info-extractor-maven3/src/main/java/org/jfrog/build/extractor/maven/BuildInfoRecorder.java

@@ -674,7 +674,7 @@ public BuildInfo extract(ExecutionEvent event) {
             long time = finish.getTime() - session.getRequest().getStartTime().getTime();
 
             BuildInfo buildInfo = buildInfoBuilder.durationMillis(time).build();
-            PackageManagerUtils.collectAndFilterEnvIfNeeded(conf, buildInfo);
+            PackageManagerUtils.collectEnvAndFilterProperties(conf, buildInfo);
             return buildInfo;
         }
 

build-info-extractor/src/main/java/org/jfrog/build/extractor/packageManager/PackageManagerExtractor.java

@@ -34,7 +34,7 @@ public void executeAndSaveBuildInfo(ArtifactoryClientConfiguration clientConfigu
         if (buildInfo == null) {
             return;
         }
-        PackageManagerUtils.collectAndFilterEnvIfNeeded(clientConfiguration, buildInfo);
+        PackageManagerUtils.collectEnvAndFilterProperties(clientConfiguration, buildInfo);
         saveBuildInfoToFile(clientConfiguration, buildInfo);
     }
 

build-info-extractor/src/main/java/org/jfrog/build/extractor/packageManager/PackageManagerUtils.java

@@ -55,12 +55,17 @@ public static String createArtifactoryUrlWithCredentials(String url, String user
     }
 
     /**
-     * Collect environment variables according to the env include-exclude patterns.
-     *
+     * Collect and filter environment variables if needed.
+     * Filter buildInfo properties according to the env include-exclude patterns.
      * @param clientConfiguration - Artifactory client configuration
      * @param buildInfo           - The target build-info
      */
-    public static void collectAndFilterEnvIfNeeded(ArtifactoryClientConfiguration clientConfiguration, BuildInfo buildInfo) {
+    public static void collectEnvAndFilterProperties(ArtifactoryClientConfiguration clientConfiguration, BuildInfo buildInfo) {
+        collectEnvIfNeeded(clientConfiguration, buildInfo);
+        filterBuildInfoProperties(clientConfiguration, buildInfo, clientConfiguration.getLog());
+    }
+
+    private static void collectEnvIfNeeded(ArtifactoryClientConfiguration clientConfiguration, BuildInfo buildInfo) {
         if (!clientConfiguration.isIncludeEnvVars()) {
             return;
         }
@@ -76,7 +81,6 @@ public static void collectAndFilterEnvIfNeeded(ArtifactoryClientConfiguration cl
             return;
         }
         buildInfo.setProperties(envProperties);
-        filterBuildInfoProperties(clientConfiguration, buildInfo, clientConfiguration.getLog());
     }
 
     public static void filterBuildInfoProperties(ArtifactoryClientConfiguration clientConfiguration, BuildInfo buildInfo, Log log) {