From d1c7521ca8065486cbf6c572d4124fbd080ff29b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Sun, 3 Apr 2016 15:29:01 +0800 Subject: [PATCH] remove codegen --- .../fastjson/parser/DefaultJSONParser.java | 24 ++++++ .../com/alibaba/fastjson/parser/Feature.java | 8 +- .../fastjson/parser/JSONLexerBase.java | 82 ------------------- .../fastjson/parser/JavaBeanMapping.java | 0 .../serializer/SerializerFeature.java | 12 +-- .../alibaba/fastjson/codegen/ClassGen.java | 0 .../fastjson/codegen/DeserializerGen.java | 0 7 files changed, 34 insertions(+), 92 deletions(-) mode change 100755 => 100644 src/main/java/com/alibaba/fastjson/parser/JavaBeanMapping.java rename src/{main => test}/java/com/alibaba/fastjson/codegen/ClassGen.java (100%) rename src/{main => test}/java/com/alibaba/fastjson/codegen/DeserializerGen.java (100%) diff --git a/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java b/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java index 748b87688..45bded87a 100755 --- a/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java +++ b/src/main/java/com/alibaba/fastjson/parser/DefaultJSONParser.java @@ -1391,6 +1391,30 @@ public class DefaultJSONParser extends AbstractJSONParser implements Closeable { this.context = context; this.referenceValue = referenceValue; } + + public ParseContext getContext() { + return context; + } + + public String getReferenceValue() { + return referenceValue; + } + + public FieldDeserializer getFieldDeserializer() { + return fieldDeserializer; + } + + public void setFieldDeserializer(FieldDeserializer fieldDeserializer) { + this.fieldDeserializer = fieldDeserializer; + } + + public ParseContext getOwnerContext() { + return ownerContext; + } + + public void setOwnerContext(ParseContext ownerContext) { + this.ownerContext = ownerContext; + } } } diff --git a/src/main/java/com/alibaba/fastjson/parser/Feature.java b/src/main/java/com/alibaba/fastjson/parser/Feature.java index eac58c671..285204c44 100755 --- a/src/main/java/com/alibaba/fastjson/parser/Feature.java +++ b/src/main/java/com/alibaba/fastjson/parser/Feature.java @@ -110,14 +110,14 @@ public enum Feature { } public static boolean isEnabled(int features, Feature feature) { - return (features & feature.getMask()) != 0; + return (features & feature.mask) != 0; } public static int config(int features, Feature feature, boolean state) { if (state) { - features |= feature.getMask(); + features |= feature.mask; } else { - features &= ~feature.getMask(); + features &= ~feature.mask; } return features; @@ -131,7 +131,7 @@ public enum Feature { int value = 0; for (Feature feature: features) { - value |= feature.getMask(); + value |= feature.mask; } return value; diff --git a/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java b/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java index 691329001..1cfd8faa7 100755 --- a/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java +++ b/src/main/java/com/alibaba/fastjson/parser/JSONLexerBase.java @@ -368,10 +368,6 @@ public abstract class JSONLexerBase implements JSONLexer, Closeable { nextTokenWithChar(':'); } - public final void nextTokenWithComma() { - nextTokenWithChar(':'); - } - public final void nextTokenWithChar(char expect) { sp = 0; @@ -511,84 +507,6 @@ public abstract class JSONLexerBase implements JSONLexer, Closeable { nextTokenWithChar(','); } - public final void nextTokenWithChar(char seperator, int expect) { - sp = 0; - - for (;;) { - if (ch == seperator) { - next(); - break; - } - - if (isWhitespace(ch)) { - next(); - continue; - } - - throw new JSONException("not match " + expect + " - " + ch); - } - - for (;;) { - if (expect == JSONToken.LITERAL_INT) { - if (ch >= '0' && ch <= '9') { - pos = bp; - scanNumber(); - return; - } - - if (ch == '"') { - pos = bp; - scanString(); - return; - } - } else if (expect == JSONToken.LITERAL_STRING) { - if (ch == '"') { - pos = bp; - scanString(); - return; - } - - if (ch >= '0' && ch <= '9') { - pos = bp; - scanNumber(); - return; - } - - } else if (expect == JSONToken.LBRACE) { - if (ch == '{') { - token = JSONToken.LBRACE; - next(); - return; - } - if (ch == '[') { - token = JSONToken.LBRACKET; - next(); - return; - } - } else if (expect == JSONToken.LBRACKET) { - if (ch == '[') { - token = JSONToken.LBRACKET; - next(); - return; - } - - if (ch == '{') { - token = JSONToken.LBRACE; - next(); - return; - } - } - - if (isWhitespace(ch)) { - next(); - continue; - } - - nextToken(); - break; - } - } - public float floatValue() { return Float.parseFloat(numberString()); } diff --git a/src/main/java/com/alibaba/fastjson/parser/JavaBeanMapping.java b/src/main/java/com/alibaba/fastjson/parser/JavaBeanMapping.java old mode 100755 new mode 100644 diff --git a/src/main/java/com/alibaba/fastjson/serializer/SerializerFeature.java b/src/main/java/com/alibaba/fastjson/serializer/SerializerFeature.java index 3872e9f69..cce6def8b 100755 --- a/src/main/java/com/alibaba/fastjson/serializer/SerializerFeature.java +++ b/src/main/java/com/alibaba/fastjson/serializer/SerializerFeature.java @@ -138,27 +138,27 @@ public enum SerializerFeature { mask = (1 << ordinal()); } - private final int mask; + public final int mask; public final int getMask() { return mask; } public static boolean isEnabled(int features, SerializerFeature feature) { - return (features & feature.getMask()) != 0; + return (features & feature.mask) != 0; } public static boolean isEnabled(int features, int fieaturesB, SerializerFeature feature) { - int mask = feature.getMask(); + int mask = feature.mask; return (features & mask) != 0 || (fieaturesB & mask) != 0; } public static int config(int features, SerializerFeature feature, boolean state) { if (state) { - features |= feature.getMask(); + features |= feature.mask; } else { - features &= ~feature.getMask(); + features &= ~feature.mask; } return features; @@ -172,7 +172,7 @@ public enum SerializerFeature { int value = 0; for (SerializerFeature feature: features) { - value |= feature.getMask(); + value |= feature.mask; } return value; diff --git a/src/main/java/com/alibaba/fastjson/codegen/ClassGen.java b/src/test/java/com/alibaba/fastjson/codegen/ClassGen.java similarity index 100% rename from src/main/java/com/alibaba/fastjson/codegen/ClassGen.java rename to src/test/java/com/alibaba/fastjson/codegen/ClassGen.java diff --git a/src/main/java/com/alibaba/fastjson/codegen/DeserializerGen.java b/src/test/java/com/alibaba/fastjson/codegen/DeserializerGen.java similarity index 100% rename from src/main/java/com/alibaba/fastjson/codegen/DeserializerGen.java rename to src/test/java/com/alibaba/fastjson/codegen/DeserializerGen.java