Merge pull request #172 from kaiyaok2/ensure_order_in_extra_options

platan · web-flow · commit 46677b1550b7 · 2023-09-02T15:57:32.000+02:00
Fix: Avoid non-deterministic order in the converter between Maven and Gradle
diff --git a/src/main/java/com/github/platan/idea/dependencies/maven/MavenToGradleMapperImpl.java b/src/main/java/com/github/platan/idea/dependencies/maven/MavenToGradleMapperImpl.java
@@ -5,6 +5,7 @@
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Predicate;
@@ -38,7 +39,7 @@ public Dependency map(@NotNull final MavenDependency mavenDependency) {
     }
 
     private HashMap<String, String> createExtraOptions(MavenDependency mavenDependency) {
-        HashMap<String, String> extraOptions = new HashMap<>();
+        HashMap<String, String> extraOptions = new LinkedHashMap<>();
         if (mavenDependency.getSystemPath() != null) {
             extraOptions.put(SYSTEM_PATH, mavenDependency.getSystemPath());
         }

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`import org.jetbrains.annotations.NotNull;`
`6`	`6`
`7`	`7`	`import java.util.HashMap;`
	`8`	`+import java.util.LinkedHashMap;`
`8`	`9`	`import java.util.List;`
`9`	`10`	`import java.util.Map;`
`10`	`11`	`import java.util.function.Predicate;`
`@@ -38,7 +39,7 @@ public Dependency map(@NotNull final MavenDependency mavenDependency) {`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`private HashMap<String, String> createExtraOptions(MavenDependency mavenDependency) {`
`41`		`- HashMap<String, String> extraOptions = new HashMap<>();`
	`42`	`+ HashMap<String, String> extraOptions = new LinkedHashMap<>();`
`42`	`43`	`if (mavenDependency.getSystemPath() != null) {`
`43`	`44`	`extraOptions.put(SYSTEM_PATH, mavenDependency.getSystemPath());`
`44`	`45`	`}`