Skip to content

Commit 3ffc270

Browse files
taowentaowen
committed
rename package
1 parent db2afe2 commit 3ffc270

25 files changed

+81
-119
lines changed

‎pom.xml

Lines changed: 3 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -3,73 +3,28 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
44
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
55
<modelVersion>4.0.0</modelVersion>
6-
<groupId>com.github.jsoniter</groupId>
7-
<version>0.0.1</version>
6+
<groupId>com.jsoniter</groupId>
7+
<version>0.9.1</version>
88
<artifactId>jsoniter</artifactId>
99
<name>json iterator</name>
10-
<url>http://maven.apache.org</url>
10+
<url>http://jsoniter.com</url>
1111

1212
<properties>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1414
</properties>
1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>org.slf4j</groupId>
19-
<artifactId>slf4j-api</artifactId>
20-
<version>1.7.21</version>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.apache.logging.log4j</groupId>
24-
<artifactId>log4j-api</artifactId>
25-
<version>2.6.1</version>
26-
</dependency>
27-
<dependency>
28-
<groupId>org.apache.logging.log4j</groupId>
29-
<artifactId>log4j-core</artifactId>
30-
<version>2.6.1</version>
31-
</dependency>
32-
<dependency>
33-
<groupId>org.apache.logging.log4j</groupId>
34-
<artifactId>log4j-slf4j-impl</artifactId>
35-
<version>2.6.1</version>
36-
</dependency>
37-
<dependency>
38-
<groupId>com.alibaba</groupId>
39-
<artifactId>fastjson</artifactId>
40-
<version>1.2.4</version>
41-
</dependency>
4217
<dependency>
4318
<groupId>junit</groupId>
4419
<artifactId>junit</artifactId>
4520
<version>4.12</version>
4621
<scope>test</scope>
4722
</dependency>
48-
<dependency>
49-
<groupId>org.openjdk.jmh</groupId>
50-
<artifactId>jmh-core</artifactId>
51-
<version>1.17.1</version>
52-
</dependency>
53-
<dependency>
54-
<groupId>org.openjdk.jmh</groupId>
55-
<artifactId>jmh-generator-annprocess</artifactId>
56-
<version>1.17.1</version>
57-
</dependency>
5823
<dependency>
5924
<groupId>org.javassist</groupId>
6025
<artifactId>javassist</artifactId>
6126
<version>3.21.0-GA</version>
6227
</dependency>
63-
<dependency>
64-
<groupId>com.dslplatform</groupId>
65-
<artifactId>dsl-json</artifactId>
66-
<version>1.3.1</version>
67-
</dependency>
68-
<dependency>
69-
<groupId>com.dslplatform</groupId>
70-
<artifactId>dsl-json-processor</artifactId>
71-
<version>1.4.1</version>
72-
</dependency>
7328
</dependencies>
7429

7530
<build>
@@ -94,15 +49,6 @@
9449
</testResource>
9550
</testResources>
9651
<plugins>
97-
<plugin>
98-
<groupId>com.github.chrisdchristo</groupId>
99-
<artifactId>capsule-maven-plugin</artifactId>
100-
<version>1.4.2</version>
101-
<configuration>
102-
<appClass>com.didi.gulfstream.Main</appClass>
103-
<type>fat</type>
104-
</configuration>
105-
</plugin>
10652
<plugin>
10753
<groupId>org.apache.maven.plugins</groupId>
10854
<artifactId>maven-compiler-plugin</artifactId>
@@ -113,26 +59,6 @@
11359
<encoding>UTF-8</encoding>
11460
</configuration>
11561
</plugin>
116-
<plugin>
117-
<groupId>org.apache.maven.plugins</groupId>
118-
<artifactId>maven-compiler-plugin</artifactId>
119-
<version>3.3</version>
120-
<configuration>
121-
<compilerArguments>
122-
<!--Adsljson.showdsl>true</Adsljson.showdsl-->
123-
<!--<Adsljson.loglevel>DEBUG</Adsljson.loglevel>-->
124-
<!--Adsljson.annotation>EXPLICIT</Adsljson.annotation-->
125-
<!--Adsljson.compiler>custom_path_to_compiler/dsl-compiler.exe</Adsljson.compiler-->
126-
</compilerArguments>
127-
</configuration>
128-
</plugin>
12962
</plugins>
13063
</build>
131-
<distributionManagement>
132-
<snapshotRepository>
133-
<id>nexus-snapshots</id>
134-
<name>Nexus Snapshot Repository</name>
135-
<url>http://maven.intra.xiaojukeji.com:8081/nexus/content/repositories/snapshots/</url>
136-
</snapshotRepository>
137-
</distributionManagement>
13864
</project>

‎src/main/java/com/github/jsoniter/Codegen.java renamed to ‎src/main/java/com/jsoniter/Codegen.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

33
import javassist.ClassPool;
44
import javassist.CtClass;
@@ -129,7 +129,7 @@ private static String genSource(String cacheKey, Class clazz, Type[] typeArgs) {
129129

130130
private static String genMap(Class clazz, Type valueType) {
131131
StringBuilder lines = new StringBuilder();
132-
append(lines, "public Object decode(java.lang.reflect.Type type, com.github.jsoniter.Jsoniter iter) {");
132+
append(lines, "public Object decode(java.lang.reflect.Type type, com.jsoniter.Jsoniter iter) {");
133133
append(lines, "{{clazz}} map = new {{clazz}}();");
134134
append(lines, "for (String field = iter.readObject(); field != null; field = iter.readObject()) {");
135135
append(lines, "map.put(field, {{op}});");
@@ -141,7 +141,7 @@ private static String genMap(Class clazz, Type valueType) {
141141

142142
private static String genNative(Class clazz) {
143143
StringBuilder lines = new StringBuilder();
144-
append(lines, "public Object decode(java.lang.reflect.Type type, com.github.jsoniter.Jsoniter iter) {");
144+
append(lines, "public Object decode(java.lang.reflect.Type type, com.jsoniter.Jsoniter iter) {");
145145
append(lines, "return " + NATIVE_READS.get(clazz.getName()) + ";");
146146
append(lines, "}");
147147
return lines.toString();
@@ -175,17 +175,17 @@ private static String genObject(Class clazz, String cacheKey) {
175175
}
176176
if (map.isEmpty()) {
177177
StringBuilder lines = new StringBuilder();
178-
append(lines, "public Object decode(java.lang.reflect.Type type, com.github.jsoniter.Jsoniter iter) {");
178+
append(lines, "public Object decode(java.lang.reflect.Type type, com.jsoniter.Jsoniter iter) {");
179179
append(lines, "{{clazz}} obj = new {{clazz}}();");
180180
append(lines, "iter.skip();");
181181
append(lines, "return obj;");
182182
append(lines, "}");
183183
return lines.toString().replace("{{clazz}}", clazz.getName());
184184
}
185185
StringBuilder lines = new StringBuilder();
186-
append(lines, "public Object decode(java.lang.reflect.Type type, com.github.jsoniter.Jsoniter iter) {");
186+
append(lines, "public Object decode(java.lang.reflect.Type type, com.jsoniter.Jsoniter iter) {");
187187
append(lines, "{{clazz}} obj = new {{clazz}}();");
188-
append(lines, "for (com.github.jsoniter.Slice field = iter.readObjectAsSlice(); field != null; field = iter.readObjectAsSlice()) {");
188+
append(lines, "for (com.jsoniter.Slice field = iter.readObjectAsSlice(); field != null; field = iter.readObjectAsSlice()) {");
189189
append(lines, "switch (field.len) {");
190190
for (Map.Entry<Integer, Object> entry : map.entrySet()) {
191191
Integer len = entry.getKey();
@@ -263,7 +263,7 @@ private static String genArray(Class clazz) {
263263
throw new IllegalArgumentException("nested array not supported: " + clazz.getCanonicalName());
264264
}
265265
StringBuilder lines = new StringBuilder();
266-
append(lines, "public Object decode(java.lang.reflect.Type type, com.github.jsoniter.Jsoniter iter) {");
266+
append(lines, "public Object decode(java.lang.reflect.Type type, com.jsoniter.Jsoniter iter) {");
267267
append(lines, "if (!iter.readArray()) {");
268268
append(lines, "return new {{comp}}[0];");
269269
append(lines, "}");
@@ -305,7 +305,7 @@ private static String genArray(Class clazz) {
305305

306306
private static String genCollectionWithCapacity(Class clazz, Type compType) {
307307
StringBuilder lines = new StringBuilder();
308-
append(lines, "public Object decode(java.lang.reflect.Type type, com.github.jsoniter.Jsoniter iter) {");
308+
append(lines, "public Object decode(java.lang.reflect.Type type, com.jsoniter.Jsoniter iter) {");
309309
append(lines, "if (!iter.readArray()) {");
310310
append(lines, "return new {{clazz}}(0);");
311311
append(lines, "}");
@@ -349,7 +349,7 @@ private static String genCollectionWithCapacity(Class clazz, Type compType) {
349349

350350
private static String genCollection(Class clazz, Type compType) {
351351
StringBuilder lines = new StringBuilder();
352-
append(lines, "public Object decode(java.lang.reflect.Type type, com.github.jsoniter.Jsoniter iter) {");
352+
append(lines, "public Object decode(java.lang.reflect.Type type, com.jsoniter.Jsoniter iter) {");
353353
append(lines, "if (!iter.readArray()) {");
354354
append(lines, "return new {{clazz}}();");
355355
append(lines, "}");

‎src/main/java/com/github/jsoniter/Decoder.java renamed to ‎src/main/java/com/jsoniter/Decoder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

33
import java.io.IOException;
44
import java.lang.reflect.Type;

‎src/main/java/com/github/jsoniter/Jsoniter.java renamed to ‎src/main/java/com/jsoniter/Jsoniter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package com.github.jsoniter;
2-
3-
import org.postgresql.util.Base64;
1+
package com.jsoniter;
42

53
import java.io.Closeable;
64
import java.io.IOException;
@@ -378,7 +376,7 @@ public final Slice readSlice() throws IOException {
378376

379377
public final byte[] readBase64() throws IOException {
380378
Slice slice = readSlice();
381-
return Base64.decode(slice.data, slice.head, slice.len);
379+
return null;
382380
}
383381

384382
public final String readString() throws IOException {

‎src/main/java/com/github/jsoniter/Slice.java renamed to ‎src/main/java/com/jsoniter/Slice.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

3-
public class Slice {
3+
class Slice {
44

55
public byte[] data;
66
public int head;

‎src/main/java/com/github/jsoniter/TypeLiteral.java renamed to ‎src/main/java/com/jsoniter/TypeLiteral.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

33
import java.lang.reflect.ParameterizedType;
44
import java.lang.reflect.Type;

‎src/main/java/com/github/jsoniter/ValueType.java renamed to ‎src/main/java/com/jsoniter/ValueType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

33
public enum ValueType {
44
INVALID,

‎test/main/java/com/github/jsoniter/ComplexObject.java renamed to ‎test/main/java/com/jsoniter/ComplexObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

33
import java.util.List;
44

‎test/main/java/com/github/jsoniter/MyObject.java renamed to ‎test/main/java/com/jsoniter/MyObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

33
public class MyObject {
44
public String field1;

‎test/main/java/com/github/jsoniter/SimpleObject.java renamed to ‎test/main/java/com/jsoniter/SimpleObject.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.github.jsoniter;
1+
package com.jsoniter;
22

33
public class SimpleObject {
44
public String field2;

0 commit comments

Comments
 (0)