🐛 use window of correct size to grab content from xml files

Signed-off-by: Pranav Gaikwad <pgaikwad@redhat.com>
konveyor · Jan 8, 2024 · 615235c · 615235c
1 parent 320c627
commit 615235c
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 1 deletion.
diff --git a/provider/internal/builtin/service_client.go b/provider/internal/builtin/service_client.go
@@ -358,7 +358,7 @@ func (b *builtinServiceClient) getLocation(ctx context.Context, path, content st
 	}()
 
 	location.StartPosition.Line = -1
-	lineNumber, err := provider.MultilineGrep(ctx, len(lines), path, pattern)
+	lineNumber, err := provider.MultilineGrep(ctx, len(parts), path, pattern)
 	if err != nil || lineNumber == -1 {
 		return location, fmt.Errorf("unable to get location in file %s - %w", path, err)
 	}

diff --git a/provider/lib_test.go b/provider/lib_test.go
@@ -47,6 +47,14 @@ func TestMultilineGrep(t *testing.T) {
 			window:   2,
 			wantErr:  false,
 		},
+		{
+			name:     "multi-line complex pattern",
+			filePath: "./testdata/test.xml",
+			pattern:  ".*?4\\.0\\.0.*?com\\.telran.*?BookServer",
+			window:   4,
+			want:     5,
+			wantErr:  false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

diff --git a/provider/testdata/test.xml b/provider/testdata/test.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>com.telran</groupId>
+    <artifactId>BookServer</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.1.0.RELEASE</version>  			<!--  09.11.2018 -->
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <!-- spring boot -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.1.0.RELEASE</version>                <!--  09.11.2018 -->
+        </dependency>
+
+        <!--  lombok -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.18.2</version>
+        </dependency>
+
+        <!-- jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.9.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.9.5</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.dataformat</groupId>
+            <artifactId>jackson-dataformat-xml</artifactId>
+            <version>2.9.5</version>
+        </dependency>
+
+        <!--&lt;!&ndash; jdbc connector &ndash;&gt;-->
+        <!--<dependency>-->
+            <!--<groupId>mysql</groupId>-->
+            <!--<artifactId>mysql-connector-java</artifactId>-->
+            <!--&lt;!&ndash; <version>8.0.12</version> &ndash;&gt;               &lt;!&ndash; TimeZone bug not fixed since 5.1.39 &ndash;&gt;-->
+            <!--<version>5.1.39</version>-->
+        <!--</dependency>-->
+
+    </dependencies>
+
+</project>