GH-545 Replace HJSON with CDN (Resolve #545)

panda-lang · Aug 14, 2020 · d2c6725 · d2c6725
1 parent 055c52e
commit d2c6725
Show file tree

Hide file tree

Showing 21 changed files with 46 additions and 55 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -3,6 +3,7 @@
 
 # Panda sources
 *.panda         text
+*.cdn           text
 *.hjson         text
 
 # Java sources

diff --git a/examples/package_manager/panda-module-dependency/app.panda b/examples/package_manager/panda-module-dependency/app.panda
@@ -1,12 +1,12 @@
 module panda-module-dependency
 
-// require panda-dependency defined in the panda.hjson
+// require panda-dependency defined in the panda.cdn
 require panda-dependency
 
 main {
     // print panda-dependency message
     log PandaDependency.getMessage()
 
-    // print subdependency (defined in panda-dependency/panda.hjson) message
+    // print subdependency (defined in panda-dependency/panda.cdn) message
     log LDDependency.getMessage()
 }
diff --git a/...nager/panda-module-dependency/panda.hjson → ...manager/panda-module-dependency/panda.cdn b/...nager/panda-module-dependency/panda.hjson → ...manager/panda-module-dependency/panda.cdn
@@ -7,6 +7,6 @@ scripts: {
 }
 
 dependencies: [
-    github:dzikoysk/[email protected].4
+    github:dzikoysk/[email protected].5
 ]
 
diff --git a/...-with-java-library-dependency/panda.hjson → ...da-with-java-library-dependency/panda.cdn b/...-with-java-library-dependency/panda.hjson → ...da-with-java-library-dependency/panda.cdn
diff --git a/examples/tests/test-local-module/panda.hjson → examples/tests/test-local-module/panda.cdn b/examples/tests/test-local-module/panda.hjson → examples/tests/test-local-module/panda.cdn
diff --git a/panda-framework/pom.xml b/panda-framework/pom.xml
@@ -32,12 +32,6 @@
             <artifactId>panda-utilities</artifactId>
         </dependency>
 
-        <!-- General -->
-        <dependency>
-            <groupId>org.hjson</groupId>
-            <artifactId>hjson</artifactId>
-        </dependency>
-
         <!-- Benchmarks -->
         <dependency>
             <groupId>org.openjdk.jmh</groupId>

diff --git a/panda-utilities/src/main/java/org/panda_lang/utilities/commons/text/ContentJoiner.java b/panda-utilities/src/main/java/org/panda_lang/utilities/commons/text/ContentJoiner.java
@@ -44,7 +44,8 @@ public <T> ContentJoiner join(Collection<T> elements, Function<T, ?> mapper) {
         return this;
     }
 
-    public ContentJoiner join(Object... elements) {
+    @SafeVarargs
+    public final <T> ContentJoiner join(T... elements) {
         return join(Arrays.asList(elements));
     }
 

diff --git a/panda/pom.xml b/panda/pom.xml
@@ -37,6 +37,10 @@
         </dependency>
 
         <!-- General -->
+        <dependency>
+            <groupId>net.dzikoysk</groupId>
+            <artifactId>cdn</artifactId>
+        </dependency>
         <dependency>
             <groupId>info.picocli</groupId>
             <artifactId>picocli</artifactId>

diff --git a/.../org/panda_lang/panda/language/interpreter/messenger/template/MicroTemplateProcessor.java b/.../org/panda_lang/panda/language/interpreter/messenger/template/MicroTemplateProcessor.java
@@ -61,7 +61,6 @@ protected String insertPrefix(String content, String prefix) {
             lines[i] = CharacterUtils.BACKSPACE + prefix + lines[i];
         }
 
-        //noinspection ConfusingArgumentToVarargsMethod
         return ContentJoiner.on("\n")
                 .join(lines)
                 .toString();

diff --git a/panda/src/main/java/org/panda_lang/panda/manager/Dependency.java b/panda/src/main/java/org/panda_lang/panda/manager/Dependency.java
@@ -73,10 +73,6 @@ public int hashCode() {
         return Objects.hash(getOwner(), getName());
     }
 
-    protected String getIdentifier() {
-        return getOwner() + "/" + getName();
-    }
-
     protected String getVersion() {
         return version;
     }

diff --git a/panda/src/main/java/org/panda_lang/panda/manager/GitHubInstall.java b/panda/src/main/java/org/panda_lang/panda/manager/GitHubInstall.java
@@ -16,6 +16,7 @@
 
 package org.panda_lang.panda.manager;
 
+import org.panda_lang.utilities.commons.FileUtils;
 import org.panda_lang.utilities.commons.IOUtils;
 import org.panda_lang.utilities.commons.ZipUtils;
 
@@ -37,8 +38,10 @@ final class GitHubInstall implements CustomInstall {
 
     @Override
     public List<Dependency> install(BiConsumer<InstallStatus, Dependency> resultConsumer, File ownerDirectory, File packageInfoFile) throws IOException {
-        String address = "https://github.com/" + dependency.getOwner() + "/" + dependency.getName() + "/archive/" + dependency.getVersion() + ".zip";
         File packageDirectory = new File(ownerDirectory, dependency.getName());
+        FileUtils.delete(packageDirectory);
+
+        String address = "https://github.com/" + dependency.getOwner() + "/" + dependency.getName() + "/archive/" + dependency.getVersion() + ".zip";
         BufferedInputStream in = null;
 
         try {

diff --git a/panda/src/main/java/org/panda_lang/panda/manager/MavenInstall.java b/panda/src/main/java/org/panda_lang/panda/manager/MavenInstall.java
@@ -72,7 +72,7 @@ public List<Dependency> install(BiConsumer<InstallStatus, Dependency> resultCons
                 File dependencyFile = new File(dependencyDirectory, dependency.getName() + "-" + dependency.getVersion() + ".jar");
                 Files.copy(in, dependencyFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
 
-//                File dependencyDocument = new File(dependencyDirectory, "panda.hjson");
+//                File dependencyDocument = new File(dependencyDirectory, "panda.cdn");
 //                FileUtils.overrideFile(dependencyDocument, "name: " + dependency.getName() + "\nversion: " + dependency.getVersion());
 
                 manager.getFrameworkController().getClassLoader().addURL(dependencyFile.toURI().toURL());

diff --git a/panda/src/main/java/org/panda_lang/panda/manager/PackageDocument.java b/panda/src/main/java/org/panda_lang/panda/manager/PackageDocument.java
@@ -16,48 +16,44 @@
 
 package org.panda_lang.panda.manager;
 
-import org.hjson.JsonObject;
-import org.hjson.JsonValue;
+import net.dzikoysk.cdn.CDN;
+import net.dzikoysk.cdn.model.Configuration;
 import org.jetbrains.annotations.Nullable;
-import org.panda_lang.utilities.commons.function.Option;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 final class PackageDocument {
 
     private final File document;
-    private final JsonObject content;
+    private final Configuration content;
 
-    PackageDocument(File document, JsonObject content) {
+    PackageDocument(File document, String source) {
         this.document = document;
-        this.content = content;
+        this.content = CDN.defaultInstance().parse(source);
     }
 
     protected Dependency toDependency() {
         return new Dependency("", getOwner(), getName(), getVersion());
     }
 
-    private List<? extends String> getList(String name) {
-        return Option.of(content.get(name))
-                .map(object -> object.asArray().values().stream()
-                        .map(JsonValue::asString)
-                        .collect(Collectors.toList()))
-                .orElseGet(ArrayList::new);
-    }
-
     private List<Dependency> getDependencies(String name) {
         DependencyFactory factory = new DependencyFactory();
+        List<String> dependencies = content.getList(name);
+
+        if (dependencies == null) {
+            return Collections.emptyList();
+        }
 
-        return getList(name).stream()
+        return dependencies.stream()
                 .map(factory::createDependency)
                 .collect(Collectors.toList());
     }
 
     protected List<? extends String> getRepositories() {
-        return getList("repositories");
+        return content.getList("repositories");
     }
 
     protected List<Dependency> getTestsDependencies() {
@@ -69,20 +65,19 @@ protected List<Dependency> getDependencies() {
     }
 
     protected @Nullable String getMainScript() {
-        JsonValue scripts = content.get("scripts");
-        return scripts == null ? null : scripts.asObject().getString("main", null);
+        return content.getString("scripts.main");
     }
 
     protected String getOwner() {
-        return content.getString("owner", null);
+        return content.getString("owner");
     }
 
     protected String getVersion() {
-        return content.getString("version", null);
+        return content.getString("version");
     }
 
     protected String getName() {
-        return content.getString("name", null);
+        return content.getString("name");
     }
 
     protected File getPandaModules() {

diff --git a/panda/src/main/java/org/panda_lang/panda/manager/PackageDocumentFile.java b/panda/src/main/java/org/panda_lang/panda/manager/PackageDocumentFile.java
@@ -16,7 +16,6 @@
 
 package org.panda_lang.panda.manager;
 
-import org.hjson.JsonValue;
 import org.panda_lang.utilities.commons.FileUtils;
 
 import java.io.File;
@@ -31,7 +30,7 @@ final class PackageDocumentFile {
     }
 
     PackageDocument getContent() throws IOException {
-        return new PackageDocument(document, JsonValue.readHjson(FileUtils.getContentOfFile(document)).asObject());
+        return new PackageDocument(document, FileUtils.getContentOfFile(document));
     }
 
 }
diff --git a/panda/src/main/java/org/panda_lang/panda/manager/PackageManagerConstants.java b/panda/src/main/java/org/panda_lang/panda/manager/PackageManagerConstants.java
@@ -20,7 +20,7 @@ final class PackageManagerConstants {
 
     public static final String MODULES = "panda_modules";
 
-    public static final String PACKAGE_INFO = "panda.hjson";
+    public static final String PACKAGE_INFO = "panda.cdn";
 
     private PackageManagerConstants() { }
 

diff --git a/panda/src/main/java/org/panda_lang/panda/shell/PandaCli.java b/panda/src/main/java/org/panda_lang/panda/shell/PandaCli.java
@@ -95,7 +95,7 @@ public void run() throws Exception {
             return;
         }
 
-        if (script.getName().endsWith("panda.hjson")) {
+        if (script.getName().endsWith("panda.cdn")) {
             PackageManager packageManager = new PackageManager(panda, script.getParentFile());
             packageManager.install(script);
             packageManager.run(panda, script);

diff --git a/panda/src/test/java/org/panda_lang/panda/manager/PackageDocumentTest.java b/panda/src/test/java/org/panda_lang/panda/manager/PackageDocumentTest.java
@@ -16,7 +16,6 @@
 
 package org.panda_lang.panda.manager;
 
-import org.hjson.JsonValue;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -35,16 +34,16 @@ static void prepare() {
                         "scripts: {\n" +
                         " main: app.panda\n" +
                         "}\n" +
-                        "dependencies: [\n" +
+                        "dependencies: {\n" +
                         " github:owner-one/[email protected]\n" +
                         " github:owner-three/[email protected]\n" +
                         " maven:org.panda-lang/[email protected]\n" +
-                        "]\n" +
-                        "tests-dependencies: [\n" +
+                        "}\n" +
+                        "tests-dependencies: {\n" +
                         " github:owner-two/[email protected]\n" +
-                        "]\n";
+                        "}\n";
 
-        document = new PackageDocument(new File("."), JsonValue.readHjson(value).asObject());
+        document = new PackageDocument(new File("."), value);
     }
 
     @Test

diff --git a/panda/src/test/java/org/panda_lang/panda/manager/PandaModuleDependencyTest.java b/panda/src/test/java/org/panda_lang/panda/manager/PandaModuleDependencyTest.java
@@ -29,7 +29,7 @@ class PandaModuleDependencyTest {
     @Test
     void test() throws Exception {
         PandaUtils.printJVMUptime(MANAGER);
-        File document = new File(DIRECTORY, "panda.hjson");
+        File document = new File(DIRECTORY, "panda.cdn");
 
         MANAGER.install(document);
         MANAGER.run(document);

diff --git a/panda/src/test/java/org/panda_lang/panda/manager/PandaWithJavaLibraryDependencyTest.java b/panda/src/test/java/org/panda_lang/panda/manager/PandaWithJavaLibraryDependencyTest.java
@@ -29,7 +29,7 @@ class PandaWithJavaLibraryDependencyTest {
     @Test
     void test() throws Exception {
         PandaUtils.printJVMUptime(MANAGER);
-        File document = new File(DIRECTORY, "panda.hjson");
+        File document = new File(DIRECTORY, "panda.cdn");
 
         MANAGER.install(document);
         MANAGER.run(document);

diff --git a/panda/src/test/java/org/panda_lang/panda/shell/PandaShellTest.java b/panda/src/test/java/org/panda_lang/panda/shell/PandaShellTest.java
@@ -25,7 +25,7 @@ final class PandaShellTest {
 
     @Test
     void test() throws Exception {
-        SHELL.invoke("--level=info", "../examples/package_manager/panda-module-dependency/panda.hjson");
+        SHELL.invoke("--level=info", "../examples/package_manager/panda-module-dependency/panda.cdn");
     }
 
 }
diff --git a/pom.xml b/pom.xml
@@ -81,9 +81,9 @@
 
             <!-- General -->
             <dependency>
-                <groupId>org.hjson</groupId>
-                <artifactId>hjson</artifactId>
-                <version>3.0.0</version>
+                <groupId>net.dzikoysk</groupId>
+                <artifactId>cdn</artifactId>
+                <version>1.3.0</version>
             </dependency>
             <dependency>
                 <groupId>info.picocli</groupId>