#58 specify static codegen output dir

Author: taowen

demo/pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.jsoniter</groupId>
     <version>0.9.8-SNAPSHOT</version>
     <artifactId>jsoniter-demo</artifactId>
-    <name>json iterator</name>
+    <name>json iterator demo</name>
     <description>jsoniter (json-iterator) is fast and flexible JSON parser available in Java and Go</description>
     <url>http://jsoniter.com</url>
     <packaging>jar</packaging>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.jsoniter</groupId>
             <artifactId>jsoniter</artifactId>
-            <version>0.9.10</version>
+            <version>0.9.11</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>
@@ -86,11 +86,11 @@
             <artifactId>slf4j-api</artifactId>
             <version>1.7.22</version>
         </dependency>
-        <dependency>
-            <groupId>com.dslplatform</groupId>
-            <artifactId>dsl-json-processor</artifactId>
-            <version>1.4.1</version>
-        </dependency>
+        <!--<dependency>-->
+            <!--<groupId>com.dslplatform</groupId>-->
+            <!--<artifactId>dsl-json-processor</artifactId>-->
+            <!--<version>1.4.1</version>-->
+        <!--</dependency>-->
         <dependency>
             <groupId>com.alibaba</groupId>
             <artifactId>fastjson</artifactId>
@@ -115,8 +115,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.6.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>1.6</source>
+                    <target>1.6</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>

demo/src/main/java/com/jsoniter/demo/DemoCodegenConfig.java

@@ -45,6 +45,9 @@ public TypeLiteral[] whatToCodegen() {
     }
 
     public static void main(String[] args) throws Exception {
-        StaticCodeGenerator.main(new String[]{DemoCodegenConfig.class.getCanonicalName()});
+        StaticCodeGenerator.main(new String[]{
+                DemoCodegenConfig.class.getCanonicalName()
+            ,"/tmp"
+        });
     }
 }

demo/src/test/java/com/jsoniter/demo/SimpleObjectBinding.java

@@ -155,18 +155,18 @@ public void withFastjson(Blackhole bh) throws IOException {
     private TestObject withIterator() throws IOException {
         iter.reset(input);
         TestObject obj = new TestObject();
-        for (String field = iter.readObject(); field != null; field = iter.readObject()) {
-            switch (field) {
-                case "field1":
-                    obj.field1 = iter.readInt();
-                    continue;
-                case "field2":
-                    obj.field2 = iter.readInt();
-                    continue;
-                default:
-                    iter.skip();
-            }
-        }
+//        for (String field = iter.readObject(); field != null; field = iter.readObject()) {
+//            switch (field) {
+//                case "field1":
+//                    obj.field1 = iter.readInt();
+//                    continue;
+//                case "field2":
+//                    obj.field2 = iter.readInt();
+//                    continue;
+//                default:
+//                    iter.skip();
+//            }
+//        }
         return obj;
     }
 

src/main/java/com/jsoniter/Codegen.java

@@ -14,7 +14,7 @@ class Codegen {
 
     // only read/write when generating code with synchronized protection
     private final static Set<String> generatedClassNames = new HashSet<String>();
-    static boolean isDoingStaticCodegen = false;
+    static StaticCodegenTarget isDoingStaticCodegen = null;
     static DecodingMode mode = DecodingMode.REFLECTION_MODE;
     static {
         String envMode = System.getenv("JSONITER_DECODING_MODE");
@@ -71,7 +71,7 @@ private synchronized static Decoder gen(String cacheKey, Type type) {
             JsoniterSpi.addNewDecoder(cacheKey, decoder);
             return decoder;
         }
-        if (!isDoingStaticCodegen) {
+        if (isDoingStaticCodegen == null) {
             try {
                 decoder = (Decoder) Class.forName(cacheKey).newInstance();
                 JsoniterSpi.addNewDecoder(cacheKey, decoder);
@@ -91,10 +91,10 @@ private synchronized static Decoder gen(String cacheKey, Type type) {
         }
         try {
             generatedClassNames.add(cacheKey);
-            if (isDoingStaticCodegen) {
-                staticGen(cacheKey, source);
-            } else {
+            if (isDoingStaticCodegen == null) {
                 decoder = DynamicCodegen.gen(cacheKey, source);
+            } else {
+                staticGen(cacheKey, source);
             }
             JsoniterSpi.addNewDecoder(cacheKey, decoder);
             return decoder;
@@ -181,7 +181,7 @@ private static Type chooseImpl(Type type) {
     private static void staticGen(String cacheKey, String source) throws IOException {
         createDir(cacheKey);
         String fileName = cacheKey.replace('.', '/') + ".java";
-        FileOutputStream fileOutputStream = new FileOutputStream(fileName);
+        FileOutputStream fileOutputStream = new FileOutputStream(new File(isDoingStaticCodegen.outputDir, fileName));
         try {
             OutputStreamWriter writer = new OutputStreamWriter(fileOutputStream);
             try {
@@ -208,7 +208,7 @@ private static void staticGen(String cacheKey, OutputStreamWriter writer, String
 
     private static void createDir(String cacheKey) {
         String[] parts = cacheKey.split("\\.");
-        File parent = new File(".");
+        File parent = new File(isDoingStaticCodegen.outputDir);
         for (int i = 0; i < parts.length - 1; i++) {
             String part = parts[i];
             File current = new File(parent, part);
@@ -259,8 +259,8 @@ private static boolean shouldUseStrictMode(ClassDescriptor desc) {
         return false;
     }
 
-    public static void staticGenDecoders(TypeLiteral[] typeLiterals) {
-        isDoingStaticCodegen = true;
+    public static void staticGenDecoders(TypeLiteral[] typeLiterals, StaticCodegenTarget staticCodegenTarget) {
+        isDoingStaticCodegen = staticCodegenTarget;
         for (TypeLiteral typeLiteral : typeLiterals) {
             gen(typeLiteral.getDecoderCacheKey(), typeLiteral.getType());
         }

src/main/java/com/jsoniter/CodegenAccess.java

@@ -1,9 +1,6 @@
 package com.jsoniter;
 
-import com.jsoniter.spi.Decoder;
-import com.jsoniter.spi.JsonException;
-import com.jsoniter.spi.JsoniterSpi;
-import com.jsoniter.spi.TypeLiteral;
+import com.jsoniter.spi.*;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -160,8 +157,8 @@ final static boolean skipWhitespacesWithoutLoadMore(JsonIterator iter) throws IO
         return true;
     }
 
-    public static void staticGenDecoders(TypeLiteral[] typeLiterals) {
-        Codegen.staticGenDecoders(typeLiterals);
+    public static void staticGenDecoders(TypeLiteral[] typeLiterals, StaticCodegenTarget staticCodegenTarget) {
+        Codegen.staticGenDecoders(typeLiterals, staticCodegenTarget);
     }
 
     public static int head(JsonIterator iter) {

src/main/java/com/jsoniter/StaticCodeGenerator.java

@@ -4,22 +4,36 @@
 import com.jsoniter.output.JsonStream;
 import com.jsoniter.spi.CodegenConfig;
 import com.jsoniter.spi.JsonException;
+import com.jsoniter.spi.StaticCodegenTarget;
 
 import java.io.File;
+import java.nio.file.Path;
 
 public class StaticCodeGenerator {
     public static void main(String[] args) throws Exception {
+        if (args.length == 0) {
+            System.out.println("StaticCodeGenerator configClassName [outputDir]");
+            System.out.println("configClassName: like a.b.Config, a class defining what to codegen");
+            System.out.println("outputDir: if not specified, will write to source directory of configClass");
+            return;
+        }
         String configClassName = args[0];
         String configJavaFile = configClassName.replace('.', '/') + ".java";
-        if (!new File(configJavaFile).exists()) {
-            throw new JsonException("must execute static code generator in the java source code directory which contains: " + configJavaFile);
+        StaticCodegenTarget staticCodegenTarget = new StaticCodegenTarget();
+        if (args.length > 1) {
+            staticCodegenTarget.outputDir = args[1];
+        } else {
+            if (!new File(configJavaFile).exists()) {
+                throw new JsonException("must execute static code generator in the java source code directory which contains: " + configJavaFile);
+            }
+            staticCodegenTarget.outputDir = new File(".").getAbsolutePath();
         }
         Class<?> clazz = Class.forName(configClassName);
         CodegenConfig config = (CodegenConfig) clazz.newInstance();
         JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_WITH_HASH);
         JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
         config.setup();
-        CodegenAccess.staticGenDecoders(config.whatToCodegen());
-        com.jsoniter.output.CodegenAccess.staticGenEncoders(config.whatToCodegen());
+        CodegenAccess.staticGenDecoders(config.whatToCodegen(), staticCodegenTarget);
+        com.jsoniter.output.CodegenAccess.staticGenEncoders(config.whatToCodegen(), staticCodegenTarget);
     }
 }

src/main/java/com/jsoniter/output/Codegen.java

@@ -1,11 +1,7 @@
 package com.jsoniter.output;
 
 import com.jsoniter.any.Any;
-import com.jsoniter.spi.JsonException;
-import com.jsoniter.spi.Encoder;
-import com.jsoniter.spi.Extension;
-import com.jsoniter.spi.JsoniterSpi;
-import com.jsoniter.spi.TypeLiteral;
+import com.jsoniter.spi.*;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -19,7 +15,7 @@
 class Codegen {
 
     static EncodingMode mode = EncodingMode.REFLECTION_MODE;
-    static boolean isDoingStaticCodegen;
+    static StaticCodegenTarget isDoingStaticCodegen;
     // only read/write when generating code with synchronized protection
     private final static Map<String, CodegenResult> generatedSources = new HashMap<String, CodegenResult>();
     private volatile static Map<String, Encoder> reflectionEncoders = new HashMap<String, Encoder>();
@@ -108,7 +104,7 @@ private static synchronized Encoder gen(final String cacheKey, Type type) {
             JsoniterSpi.addNewEncoder(cacheKey, encoder);
             return encoder;
         }
-        if (!isDoingStaticCodegen) {
+        if (isDoingStaticCodegen == null) {
             try {
                 encoder = (Encoder) Class.forName(cacheKey).newInstance();
                 JsoniterSpi.addNewEncoder(cacheKey, encoder);
@@ -123,10 +119,10 @@ private static synchronized Encoder gen(final String cacheKey, Type type) {
         CodegenResult source = genSource(cacheKey, clazz, typeArgs);
         try {
             generatedSources.put(cacheKey, source);
-            if (isDoingStaticCodegen) {
-                staticGen(clazz, cacheKey, source);
-            } else {
+            if (isDoingStaticCodegen == null) {
                 encoder = DynamicCodegen.gen(clazz, cacheKey, source);
+            } else {
+                staticGen(clazz, cacheKey, source);
             }
             JsoniterSpi.addNewEncoder(cacheKey, encoder);
             return encoder;
@@ -165,7 +161,7 @@ public static CodegenResult getGeneratedSource(String cacheKey) {
     private static void staticGen(Class clazz, String cacheKey, CodegenResult source) throws IOException {
         createDir(cacheKey);
         String fileName = cacheKey.replace('.', '/') + ".java";
-        FileOutputStream fileOutputStream = new FileOutputStream(fileName);
+        FileOutputStream fileOutputStream = new FileOutputStream(new File(isDoingStaticCodegen.outputDir, fileName));
         try {
             OutputStreamWriter writer = new OutputStreamWriter(fileOutputStream);
             try {
@@ -190,7 +186,7 @@ private static void staticGen(Class clazz, String cacheKey, OutputStreamWriter w
 
     private static void createDir(String cacheKey) {
         String[] parts = cacheKey.split("\\.");
-        File parent = new File(".");
+        File parent = new File(isDoingStaticCodegen.outputDir);
         for (int i = 0; i < parts.length - 1; i++) {
             String part = parts[i];
             File current = new File(parent, part);
@@ -215,8 +211,8 @@ private static CodegenResult genSource(String cacheKey, Class clazz, Type[] type
         return CodegenImplObject.genObject(clazz);
     }
 
-    public static void staticGenEncoders(TypeLiteral[] typeLiterals) {
-        isDoingStaticCodegen = true;
+    public static void staticGenEncoders(TypeLiteral[] typeLiterals, StaticCodegenTarget staticCodegenTarget) {
+        isDoingStaticCodegen = staticCodegenTarget;
         for (TypeLiteral typeLiteral : typeLiterals) {
             gen(typeLiteral.getEncoderCacheKey(), typeLiteral.getType());
         }

src/main/java/com/jsoniter/output/CodegenAccess.java

@@ -4,6 +4,7 @@
 import com.jsoniter.any.Any;
 import com.jsoniter.spi.Encoder;
 import com.jsoniter.spi.JsoniterSpi;
+import com.jsoniter.spi.StaticCodegenTarget;
 import com.jsoniter.spi.TypeLiteral;
 
 import java.io.IOException;
@@ -57,8 +58,8 @@ public static void writeStringWithoutQuote(String obj, JsonStream stream) throws
         StreamImplString.writeStringWithoutQuote(stream, obj);
     }
 
-    public static void staticGenEncoders(TypeLiteral[] typeLiterals) {
-        Codegen.staticGenEncoders(typeLiterals);
+    public static void staticGenEncoders(TypeLiteral[] typeLiterals, StaticCodegenTarget staticCodegenTarget) {
+        Codegen.staticGenEncoders(typeLiterals, staticCodegenTarget);
     }
 
     public static Any wrap(Object val) {

src/main/java/com/jsoniter/spi/StaticCodegenTarget.java

@@ -0,0 +1,5 @@
+package com.jsoniter.spi;
+
+public class StaticCodegenTarget {
+    public String outputDir;
+}