remove duplicate dependency and use toml4j

apache · Feb 26, 2024 · f4a0a30 · f4a0a30
1 parent 8a82499
commit f4a0a30
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 96 deletions.
diff --git a/integration-test/rust/pom.xml b/integration-test/rust/pom.xml
@@ -66,15 +66,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.uniffle</groupId>
-            <artifactId>shuffle-server</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.uniffle</groupId>
-            <artifactId>rss-client</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
+            <groupId>com.moandjiezana.toml</groupId>
+            <artifactId>toml4j</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/integration-test/rust/src/test/java/org/apache/uniffle/test/RustShuffleServerConf.java b/integration-test/rust/src/test/java/org/apache/uniffle/test/RustShuffleServerConf.java
@@ -17,25 +17,18 @@
 
 package org.apache.uniffle.test;
 
+import com.moandjiezana.toml.TomlWriter;
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 public class RustShuffleServerConf {
 
-  private static final Logger LOG = LoggerFactory.getLogger(RustShuffleServerConf.class);
-
   private final Map<String, Object> conf;
-
   private final File tempDir;
-
   private final File tempFile;
 
   public RustShuffleServerConf(File tempDir) {
@@ -57,78 +50,9 @@ public void set(String key, Object value) {
   }
 
   public void generateTomlConf() throws IOException {
-    writeToFile(toTomlString(conf), tempFile.getPath());
-  }
-
-  public String toTomlString(Map<String, Object> tomlData) {
-    StringBuilder tomlBuilder = new StringBuilder();
-
-    for (Map.Entry<String, Object> entry : tomlData.entrySet()) {
-      if (!(entry.getValue() instanceof Map)) {
-        appendEntry(tomlBuilder, entry);
-      }
-    }
-
-    for (Map.Entry<String, Object> entry : tomlData.entrySet()) {
-      if (entry.getValue() instanceof Map) {
-        tomlBuilder.append("\n[").append(entry.getKey()).append("]\n");
-        Map<?, ?> nestedMap = (Map<?, ?>) entry.getValue();
-        for (Map.Entry<?, ?> nestedEntry : nestedMap.entrySet()) {
-          appendEntry(tomlBuilder, nestedEntry);
-        }
-      }
-    }
-
-    return tomlBuilder.toString();
-  }
-
-  private void appendEntry(StringBuilder builder, Map.Entry<?, ?> entry) {
-    if (entry.getValue() instanceof List) {
-      builder
-          .append(entry.getKey())
-          .append(" = ")
-          .append(listToString((List<?>) entry.getValue()))
-          .append("\n");
-    } else {
-      builder
-          .append(entry.getKey())
-          .append(" = ")
-          .append(valueToString(entry.getValue()))
-          .append("\n");
-    }
-  }
-
-  private String mapToString(Map<?, ?> map) {
-    StringBuilder mapBuilder = new StringBuilder();
-    for (Map.Entry<?, ?> entry : map.entrySet()) {
-      mapBuilder
-          .append(entry.getKey())
-          .append(" = ")
-          .append(valueToString(entry.getValue()))
-          .append("\n");
-    }
-    return mapBuilder.toString();
-  }
-
-  private String listToString(List<?> list) {
-    StringBuilder listBuilder = new StringBuilder("[");
-    boolean first = true;
-    for (Object item : list) {
-      if (!first) {
-        listBuilder.append(", ");
-      }
-      listBuilder.append(valueToString(item));
-      first = false;
-    }
-    listBuilder.append("]");
-    return listBuilder.toString();
-  }
-
-  private String valueToString(Object value) {
-    if (value instanceof String) {
-      return "\"" + value + "\"";
-    }
-    return value.toString();
+    TomlWriter tomlWriter = new TomlWriter();
+    String toml = tomlWriter.write(conf);
+    writeToFile(toml, tempFile.getPath());
   }
 
   private void writeToFile(String content, String filePath) throws IOException {

diff --git a/pom.xml b/pom.xml
@@ -105,6 +105,7 @@
     <skipITs>${skipTests}</skipITs>
     <skipBuildImage>true</skipBuildImage>
     <snakeyaml.version>2.2</snakeyaml.version>
+    <toml4j.version>0.7.2</toml4j.version>
   </properties>
 
   <repositories>
@@ -2358,13 +2359,6 @@
             <type>test-jar</type>
             <scope>test</scope>
           </dependency>
-          <dependency>
-            <groupId>org.apache.uniffle</groupId>
-            <artifactId>shuffle-server</artifactId>
-            <version>${project.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-          </dependency>
           <dependency>
             <groupId>org.apache.uniffle</groupId>
             <artifactId>rss-client</artifactId>
@@ -2377,6 +2371,11 @@
             <type>test-jar</type>
             <scope>test</scope>
           </dependency>
+          <dependency>
+            <groupId>com.moandjiezana.toml</groupId>
+            <artifactId>toml4j</artifactId>
+            <version>${toml4j.version}</version>
+          </dependency>
         </dependencies>
       </dependencyManagement>
     </profile>