updating to remove regex

blackducksoftware · Mar 12, 2020 · d220eb8 · d220eb8
1 parent cdedd36
commit d220eb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 10 deletions.
diff --git a/src/main/groovy/com/synopsys/integration/utility/BuildFileUtility.groovy b/src/main/groovy/com/synopsys/integration/utility/BuildFileUtility.groovy
@@ -65,16 +65,13 @@ public class BuildFileUtility {
     }
 
     public String updateBuildScriptDependenciesToApplyFromRemote(String buildFileContents, String replacement) {
-        String currentContentPattern = getBuildScriptDependencyContentPattern()
+        int startIndex = buildFileContents.indexOf(START_BUILDSCRIPT_DEPENDENCY) - 1
+        int endIndex = buildFileContents.indexOf(END_BUILDSCRIPT_DEPENDENCY) + END_BUILDSCRIPT_DEPENDENCY.length()
 
-        String newContents = buildFileContents.replaceAll(currentContentPattern, replacement)
+        String newContents = buildFileContents[0..startIndex] + replacement + buildFileContents[endIndex..-1]
         return newContents
     }
 
-    public String getBuildScriptDependencyContentPattern() {
-        return "${START_BUILDSCRIPT_DEPENDENCY}(.*\\n.*)+${END_BUILDSCRIPT_DEPENDENCY}"
-    }
-
     public String getBuildScriptDependencyLinePattern() {
         return "apply\\sfrom:\\s[\"\']?.*buildscript-dependencies.gradle[\"\']?,\\sto:\\sbuildscript"
     }

diff --git a/src/test/groovy/com/synopsys/integration/utility/BuildFileUtilityTest.groovy b/src/test/groovy/com/synopsys/integration/utility/BuildFileUtilityTest.groovy
@@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test
 import static org.junit.jupiter.api.Assertions.assertEquals
 
 class BuildFileUtilityTest {
-
     @Test
     void updateVersionContentTest() {
         String buildFileContent = """

diff --git a/src/test/groovy/com/synopsys/integration/utility/VersionUtilityTest.groovy b/src/test/groovy/com/synopsys/integration/utility/VersionUtilityTest.groovy
@@ -1,13 +1,10 @@
 package com.synopsys.integration.utility
 
-import com.synopsys.integration.utility.VersionUtility
 import org.junit.jupiter.api.Test
 
 import static org.junit.jupiter.api.Assertions.assertEquals
 
-
 class VersionUtilityTest {
-
     @Test
     void calculateReleaseVersionTest() {
         VersionUtility versionUtility = new VersionUtility()
@@ -142,4 +139,5 @@ class VersionUtilityTest {
         version = versionUtility.calculateNextSnapshot(version)
         assertEquals('4.7.4-SNAPSHOT', version)
     }
+
 }