Address Gemini code review feedback

- Use os.Getwd() instead of filepath.Abs(os.Getenv("PWD")) for better portability
- Update Java version from 11 to 21 to match test Docker image
- Use Map.of() for immutable maps (Java 9+ best practice)
- Remove unused HashMap import
- Refactor integration test runner to use loop pattern for better maintainability

Author: Vikky92

test/integration/cmd/java/run.go

@@ -76,7 +76,7 @@ func main() {
 	ctx := context.Background()
 
 	// Get project root
-	projectDir, err := filepath.Abs(os.Getenv("PWD"))
+	projectDir, err := os.Getwd()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to get project dir: %v\n", err)
 		os.Exit(1)

test/integration/cmd/run.go

@@ -7,51 +7,28 @@ import (
 )
 
 func main() {
-	// Run the language-specific tests
 	fmt.Println("=== Running all integration tests ===")
 
-	// Run the C# integration test
-	csharpCmd := exec.Command("go", "run", "github.com/open-feature/cli/test/integration/cmd/csharp")
-	csharpCmd.Stdout = os.Stdout
-	csharpCmd.Stderr = os.Stderr
-	if err := csharpCmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error running C# integration test: %v\n", err)
-		os.Exit(1)
+	tests := []struct {
+		name string
+		path string
+	}{
+		{"C#", "github.com/open-feature/cli/test/integration/cmd/csharp"},
+		{"Go", "github.com/open-feature/cli/test/integration/cmd/go"},
+		{"NodeJS", "github.com/open-feature/cli/test/integration/cmd/nodejs"},
+		{"Angular", "github.com/open-feature/cli/test/integration/cmd/angular"},
+		{"Java", "github.com/open-feature/cli/test/integration/cmd/java"},
 	}
 
-	// Run the Go integration test
-	goCmd := exec.Command("go", "run", "github.com/open-feature/cli/test/integration/cmd/go")
-	goCmd.Stdout = os.Stdout
-	goCmd.Stderr = os.Stderr
-	if err := goCmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error running Go integration test: %v\n", err)
-		os.Exit(1)
-	}
-	// Run the nodejs test
-	nodeCmd := exec.Command("go", "run", "github.com/open-feature/cli/test/integration/cmd/nodejs")
-	nodeCmd.Stdout = os.Stdout
-	nodeCmd.Stderr = os.Stderr
-	if err := nodeCmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error running nodejs integration test: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Run the Angular integration test
-	angularCmd := exec.Command("go", "run", "github.com/open-feature/cli/test/integration/cmd/angular")
-	angularCmd.Stdout = os.Stdout
-	angularCmd.Stderr = os.Stderr
-	if err := angularCmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error running Angular integration test: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Run the Java integration test
-	javaCmd := exec.Command("go", "run", "github.com/open-feature/cli/test/integration/cmd/java")
-	javaCmd.Stdout = os.Stdout
-	javaCmd.Stderr = os.Stderr
-	if err := javaCmd.Run(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error running Java integration test: %v\n", err)
-		os.Exit(1)
+	for _, test := range tests {
+		fmt.Printf("--- Running %s integration test ---\n", test.name)
+		cmd := exec.Command("go", "run", test.path)
+		cmd.Stdout = os.Stdout
+		cmd.Stderr = os.Stderr
+		if err := cmd.Run(); err != nil {
+			fmt.Fprintf(os.Stderr, "Error running %s integration test: %v\n", test.name, err)
+			os.Exit(1)
+		}
 	}
 
 	fmt.Println("=== All integration tests passed successfully ===")

test/java-integration/pom.xml

@@ -9,8 +9,8 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>11</maven.compiler.source>
-        <maven.compiler.target>11</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
@@ -30,8 +30,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>11</source>
-                    <target>11</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
             </plugin>
             <plugin>

test/java-integration/src/main/java/dev/openfeature/Main.java

@@ -5,7 +5,6 @@
 import dev.openfeature.sdk.providers.memory.Flag;
 import dev.openfeature.sdk.providers.memory.InMemoryProvider;
 
-import java.util.HashMap;
 import java.util.Map;
 
 public class Main {
@@ -22,36 +21,33 @@ public static void main(String[] args) {
 
     private static void run() throws Exception {
         // Set up the in-memory provider with test flags
-        Map<String, Flag<?>> flags = new HashMap<>();
-
-        flags.put("discountPercentage", Flag.builder()
-            .variant("default", 0.15)
-            .defaultVariant("default")
-            .build());
-
-        flags.put("enableFeatureA", Flag.builder()
-            .variant("default", false)
-            .defaultVariant("default")
-            .build());
-
-        flags.put("greetingMessage", Flag.builder()
-            .variant("default", "Hello there!")
-            .defaultVariant("default")
-            .build());
-
-        flags.put("usernameMaxLength", Flag.builder()
-            .variant("default", 50)
-            .defaultVariant("default")
-            .build());
-
-        Map<String, Object> themeConfig = new HashMap<>();
-        themeConfig.put("primaryColor", "#007bff");
-        themeConfig.put("secondaryColor", "#6c757d");
-
-        flags.put("themeCustomization", Flag.builder()
-            .variant("default", new Value(themeConfig))
-            .defaultVariant("default")
-            .build());
+        Map<String, Object> themeConfig = Map.of(
+            "primaryColor", "#007bff",
+            "secondaryColor", "#6c757d"
+        );
+
+        Map<String, Flag<?>> flags = Map.of(
+            "discountPercentage", Flag.builder()
+                .variant("default", 0.15)
+                .defaultVariant("default")
+                .build(),
+            "enableFeatureA", Flag.builder()
+                .variant("default", false)
+                .defaultVariant("default")
+                .build(),
+            "greetingMessage", Flag.builder()
+                .variant("default", "Hello there!")
+                .defaultVariant("default")
+                .build(),
+            "usernameMaxLength", Flag.builder()
+                .variant("default", 50)
+                .defaultVariant("default")
+                .build(),
+            "themeCustomization", Flag.builder()
+                .variant("default", new Value(themeConfig))
+                .defaultVariant("default")
+                .build()
+        );
 
         InMemoryProvider provider = new InMemoryProvider(flags);