cache parsed results across multiple runs (#667)

Co-authored-by: rzpt <> Co-authored-by: forozco <forozco@palantir.com>
palantir · Aug 13, 2020 · 5715c5c · 5715c5c
1 parent 5e5e4f1
commit 5715c5c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/changelog/@unreleased/pr-667.v2.yml b/changelog/@unreleased/pr-667.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Each conjure file will only be parsed once
+  urls:
+    - https://github.com/palantir/conjure/pull/667
diff --git a/conjure-core/src/main/java/com/palantir/conjure/defs/Conjure.java b/conjure-core/src/main/java/com/palantir/conjure/defs/Conjure.java
@@ -23,7 +23,6 @@
 import java.io.File;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public final class Conjure {
     public static final Integer SUPPORTED_IR_VERSION = 1;
@@ -34,8 +33,7 @@ private Conjure() {}
      * Deserializes {@link ConjureDefinition} from their YAML representations in the given files.
      */
     public static ConjureDefinition parse(Collection<File> files) {
-        List<AnnotatedConjureSourceFile> sourceFiles =
-                files.stream().map(ConjureParser::parseAnnotated).collect(Collectors.toList());
+        List<AnnotatedConjureSourceFile> sourceFiles = ConjureParser.parseAnnotated(files);
         ConjureDefinition ir = ConjureParserUtils.parseConjureDef(sourceFiles);
         return NormalizeDefinition.normalize(ir);
     }

diff --git a/conjure-core/src/main/java/com/palantir/conjure/parser/ConjureParser.java b/conjure-core/src/main/java/com/palantir/conjure/parser/ConjureParser.java
@@ -30,8 +30,10 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -61,8 +63,18 @@ public static ConjureSourceFile parse(File file) {
     }
 
     public static AnnotatedConjureSourceFile parseAnnotated(File file) {
+        RecursiveParser parser = new RecursiveParser();
+        return parseAnnotated(parser, file);
+    }
+
+    public static List<AnnotatedConjureSourceFile> parseAnnotated(Collection<File> files) {
+        RecursiveParser parser = new RecursiveParser();
+        return files.stream().map(file -> parseAnnotated(parser, file)).collect(Collectors.toList());
+    }
+
+    private static AnnotatedConjureSourceFile parseAnnotated(RecursiveParser parser, File file) {
         return AnnotatedConjureSourceFile.builder()
-                .conjureSourceFile(ConjureParser.parse(file))
+                .conjureSourceFile(parser.parse(file))
                 .sourceFile(file)
                 .build();
     }