fix static code gen

Author: taowen

.gitignore

@@ -6,3 +6,6 @@
 /android-demo/build
 /android-demo/.gradle
 /android-demo/local.properties
+/android-demo/gradlew
+/android-demo/gradle
+/android-demo/gradlew.bat

android-demo/.gitignore

@@ -1 +1,3 @@
 /build
+/.idea
+/gradle.properties

android-demo/build.gradle

@@ -35,6 +35,7 @@ dependencies {
 buildscript {
     repositories {
         maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.0'   //last version Jan 2016
@@ -44,5 +45,6 @@ buildscript {
 allprojects {
     repositories {
         maven{ url 'http://maven.aliyun.com/nexus/content/groups/public/'}
+        google()
     }
 }

demo/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.jsoniter</groupId>
-    <version>0.9.8-SNAPSHOT</version>
+    <version>0.9.19-SNAPSHOT</version>
     <artifactId>jsoniter-demo</artifactId>
     <name>json iterator demo</name>
     <description>jsoniter (json-iterator) is fast and flexible JSON parser available in Java and Go</description>
@@ -49,7 +49,7 @@
         <dependency>
             <groupId>com.jsoniter</groupId>
             <artifactId>jsoniter</artifactId>
-            <version>0.9.11</version>
+            <version>0.9.19-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.openjdk.jmh</groupId>

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

@@ -1,17 +1,14 @@
 package com.jsoniter.demo;
 
-import com.jsoniter.DecodingMode;
 import com.jsoniter.JsonIterator;
 import com.jsoniter.output.EncodingMode;
 import com.jsoniter.output.JsonStream;
+import com.jsoniter.spi.DecodingMode;
 
 public class Demo {
     static {
         // ensure the jsoniter is properly setup
         new DemoCodegenConfig().setup();
-        JsonIterator.setMode(DecodingMode.STATIC_MODE);
-        JsonStream.setMode(EncodingMode.STATIC_MODE);
-        JsonStream.defaultIndentionStep = 2;
     }
 
     public static void main(String[] args) {

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

@@ -1,24 +1,28 @@
 package com.jsoniter.demo;
 
 import com.jsoniter.JsonIterator;
-import com.jsoniter.StaticCodeGenerator;
-import com.jsoniter.annotation.JsoniterAnnotationSupport;
-import com.jsoniter.spi.CodegenConfig;
+import com.jsoniter.output.EncodingMode;
+import com.jsoniter.output.JsonStream;
 import com.jsoniter.spi.Decoder;
+import com.jsoniter.spi.DecodingMode;
 import com.jsoniter.spi.JsoniterSpi;
 import com.jsoniter.spi.TypeLiteral;
+import com.jsoniter.static_codegen.StaticCodegen;
+import com.jsoniter.static_codegen.StaticCodegenConfig;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-public class DemoCodegenConfig implements CodegenConfig {
+public class DemoCodegenConfig implements StaticCodegenConfig {
 
     @Override
     public void setup() {
-        JsoniterAnnotationSupport.enable();
         // register custom decoder or extensions before codegen
         // so that we doing codegen, we know in which case, we need to callback
+        JsonIterator.setMode(DecodingMode.STATIC_MODE);
+        JsonStream.setMode(EncodingMode.STATIC_MODE);
+        JsonStream.setIndentionStep(2);
         JsoniterSpi.registerPropertyDecoder(User.class, "score", new Decoder.IntDecoder() {
             @Override
             public int decodeInt(JsonIterator iter) throws IOException {
@@ -45,7 +49,7 @@ public TypeLiteral[] whatToCodegen() {
     }
 
     public static void main(String[] args) throws Exception {
-        StaticCodeGenerator.main(new String[]{
+        StaticCodegen.main(new String[]{
                 DemoCodegenConfig.class.getCanonicalName()
             ,"/tmp"
         });

demo/src/main/java/encoder/com/jsoniter/demo/User.java

@@ -1,4 +1,4 @@
-package decoder.com.jsoniter.demo;
+package jsoniter_codegen.cfg1173796797.decoder.com.jsoniter.demo;
 public class User implements com.jsoniter.spi.Decoder {
 public static java.lang.Object decode_(com.jsoniter.JsonIterator iter) throws java.io.IOException { java.lang.Object existingObj = com.jsoniter.CodegenAccess.resetExistingObject(iter);
 byte nextToken = com.jsoniter.CodegenAccess.readByte(iter);
@@ -39,7 +39,7 @@ public class User implements com.jsoniter.spi.Decoder {
 _firstName_ = (java.lang.String)iter.readString();
 continue;
 case -768634731: 
-_score_ = (int)com.jsoniter.CodegenAccess.readInt("[email protected]", iter);
+_score_ = (int)com.jsoniter.CodegenAccess.readInt("score@jsoniter_codegen.cfg1173796797.decoder.com.jsoniter.demo.User", iter);
 continue;
 }
 iter.skip();