kick static codegen out of spi package

Author: taowen

demo/pom.xml

@@ -137,7 +137,7 @@
                             <arguments>
                                 <argument>-classpath</argument>
                                 <classpath/>
-                                <argument>com.jsoniter.StaticCodeGenerator</argument>
+                                <argument>com.jsoniter.static_codegen.StaticCodegen</argument>
                                 <argument>com.jsoniter.demo.DemoCodegenConfig</argument>
                             </arguments>
                         </configuration>

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 StaticCodegenTarget isDoingStaticCodegen = null;
+    static CodegenAccess.StaticCodegenTarget isDoingStaticCodegen = null;
     static DecodingMode mode = DecodingMode.REFLECTION_MODE;
     static {
         String envMode = System.getenv("JSONITER_DECODING_MODE");
@@ -270,7 +270,7 @@ private static boolean shouldUseStrictMode(ClassDescriptor desc) {
         return false;
     }
 
-    public static void staticGenDecoders(TypeLiteral[] typeLiterals, StaticCodegenTarget staticCodegenTarget) {
+    public static void staticGenDecoders(TypeLiteral[] typeLiterals, CodegenAccess.StaticCodegenTarget staticCodegenTarget) {
         isDoingStaticCodegen = staticCodegenTarget;
         for (TypeLiteral typeLiteral : typeLiterals) {
             gen(typeLiteral.getDecoderCacheKey(), typeLiteral.getType());

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

@@ -186,4 +186,12 @@ public static int calcHash(String str) {
     public static void skipFixedBytes(JsonIterator iter, int n) throws IOException {
         IterImpl.skipFixedBytes(iter, n);
     }
+
+    public static class StaticCodegenTarget {
+        public String outputDir;
+
+        public StaticCodegenTarget(String outputDir) {
+            this.outputDir = outputDir;
+        }
+    }
 }

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

@@ -15,7 +15,7 @@
 class Codegen {
 
     static EncodingMode mode = EncodingMode.REFLECTION_MODE;
-    static StaticCodegenTarget isDoingStaticCodegen;
+    static CodegenAccess.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>();
@@ -211,7 +211,7 @@ private static CodegenResult genSource(String cacheKey, Class clazz, Type[] type
         return CodegenImplObject.genObject(clazz);
     }
 
-    public static void staticGenEncoders(TypeLiteral[] typeLiterals, StaticCodegenTarget staticCodegenTarget) {
+    public static void staticGenEncoders(TypeLiteral[] typeLiterals, CodegenAccess.StaticCodegenTarget staticCodegenTarget) {
         isDoingStaticCodegen = staticCodegenTarget;
         for (TypeLiteral typeLiteral : typeLiterals) {
             gen(typeLiteral.getEncoderCacheKey(), typeLiteral.getType());

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

@@ -1,10 +1,8 @@
 package com.jsoniter.output;
 
-import com.jsoniter.*;
 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;
@@ -70,4 +68,13 @@ public static Any wrap(Object val) {
         String cacheKey = TypeLiteral.create(clazz).getEncoderCacheKey();
         return Codegen.getReflectionEncoder(cacheKey, clazz).wrap(val);
     }
+
+    public static class StaticCodegenTarget {
+
+        public final String outputDir;
+
+        public StaticCodegenTarget(String outputDir) {
+            this.outputDir = outputDir;
+        }
+    }
 }

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

@@ -1,39 +1,41 @@
-package com.jsoniter;
+package com.jsoniter.static_codegen;
 
+import com.jsoniter.CodegenAccess;
+import com.jsoniter.DecodingMode;
+import com.jsoniter.JsonIterator;
 import com.jsoniter.output.EncodingMode;
 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 class StaticCodegen {
     public static void main(String[] args) throws Exception {
         if (args.length == 0) {
-            System.out.println("StaticCodeGenerator configClassName [outputDir]");
+            System.out.println("StaticCodegen 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";
-        StaticCodegenTarget staticCodegenTarget = new StaticCodegenTarget();
+        String outputDir;
         if (args.length > 1) {
-            staticCodegenTarget.outputDir = args[1];
+            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();
+            outputDir = new File(".").getAbsolutePath();
         }
         Class<?> clazz = Class.forName(configClassName);
-        CodegenConfig config = (CodegenConfig) clazz.newInstance();
+        StaticCodegenConfig config = (StaticCodegenConfig) clazz.newInstance();
         JsonIterator.setMode(DecodingMode.DYNAMIC_MODE_AND_MATCH_FIELD_WITH_HASH);
         JsonStream.setMode(EncodingMode.DYNAMIC_MODE);
         config.setup();
-        CodegenAccess.staticGenDecoders(config.whatToCodegen(), staticCodegenTarget);
-        com.jsoniter.output.CodegenAccess.staticGenEncoders(config.whatToCodegen(), staticCodegenTarget);
+        CodegenAccess.staticGenDecoders(
+                config.whatToCodegen(), new CodegenAccess.StaticCodegenTarget(outputDir));
+        com.jsoniter.output.CodegenAccess.staticGenEncoders(
+                config.whatToCodegen(), new com.jsoniter.output.CodegenAccess.StaticCodegenTarget(outputDir));
     }
 }

…va/com/jsoniter/StaticCodeGenerator.java …oniter/static_codegen/StaticCodegen.javasrc/main/java/com/jsoniter/StaticCodeGenerator.java renamed to src/main/java/com/jsoniter/static_codegen/StaticCodegen.java src/main/java/com/jsoniter/StaticCodeGenerator.java renamed to src/main/java/com/jsoniter/static_codegen/StaticCodegen.java

@@ -1,6 +1,8 @@
-package com.jsoniter.spi;
+package com.jsoniter.static_codegen;
 
-public interface CodegenConfig {
+import com.jsoniter.spi.TypeLiteral;
+
+public interface StaticCodegenConfig {
     /**
      * register decoder/encoder before codegen
      * register extension before codegen