Skip to content

Commit 4da35ed

Browse files
UrielChUrielCh
committed
upgrade code
1 parent 581f6da commit 4da35ed

File tree

6 files changed

+57
-43
lines changed

6 files changed

+57
-43
lines changed

‎accessors-smart/src/main/java/net/minidev/asm/ASMUtil.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -79,28 +79,28 @@ static public Accessor[] getAccessors(Class<?> type, FieldFilter filter) {
7979
protected static void autoBoxing(MethodVisitor mv, Type fieldType) {
8080
switch (fieldType.getSort()) {
8181
case Type.BOOLEAN:
82-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Boolean", "valueOf", "(Z)Ljava/lang/Boolean;");
82+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Boolean", "valueOf", "(Z)Ljava/lang/Boolean;", false);
8383
break;
8484
case Type.BYTE:
85-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Byte", "valueOf", "(B)Ljava/lang/Byte;");
85+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Byte", "valueOf", "(B)Ljava/lang/Byte;", false);
8686
break;
8787
case Type.CHAR:
88-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Character", "valueOf", "(C)Ljava/lang/Character;");
88+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Character", "valueOf", "(C)Ljava/lang/Character;", false);
8989
break;
9090
case Type.SHORT:
91-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Short", "valueOf", "(S)Ljava/lang/Short;");
91+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Short", "valueOf", "(S)Ljava/lang/Short;", false);
9292
break;
9393
case Type.INT:
94-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;");
94+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false);
9595
break;
9696
case Type.FLOAT:
97-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Float", "valueOf", "(F)Ljava/lang/Float;");
97+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Float", "valueOf", "(F)Ljava/lang/Float;", false);
9898
break;
9999
case Type.LONG:
100-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Long", "valueOf", "(J)Ljava/lang/Long;");
100+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Long", "valueOf", "(J)Ljava/lang/Long;", false);
101101
break;
102102
case Type.DOUBLE:
103-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;");
103+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Double", "valueOf", "(D)Ljava/lang/Double;", false);
104104
break;
105105
}
106106
}
@@ -115,35 +115,35 @@ protected static void autoUnBoxing1(MethodVisitor mv, Type fieldType) {
115115
switch (fieldType.getSort()) {
116116
case Type.BOOLEAN:
117117
mv.visitTypeInsn(CHECKCAST, "java/lang/Boolean");
118-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Boolean", "booleanValue", "()Z");
118+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Boolean", "booleanValue", "()Z", false);
119119
break;
120120
case Type.BYTE:
121121
mv.visitTypeInsn(CHECKCAST, "java/lang/Byte");
122-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Byte", "byteValue", "()B");
122+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Byte", "byteValue", "()B", false);
123123
break;
124124
case Type.CHAR:
125125
mv.visitTypeInsn(CHECKCAST, "java/lang/Character");
126-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Character", "charValue", "()C");
126+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Character", "charValue", "()C", false);
127127
break;
128128
case Type.SHORT:
129129
mv.visitTypeInsn(CHECKCAST, "java/lang/Short");
130-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Short", "shortValue", "()S");
130+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Short", "shortValue", "()S", false);
131131
break;
132132
case Type.INT:
133133
mv.visitTypeInsn(CHECKCAST, "java/lang/Integer");
134-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Integer", "intValue", "()I");
134+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Integer", "intValue", "()I", false);
135135
break;
136136
case Type.FLOAT:
137137
mv.visitTypeInsn(CHECKCAST, "java/lang/Float");
138-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Float", "floatValue", "()F");
138+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Float", "floatValue", "()F", false);
139139
break;
140140
case Type.LONG:
141141
mv.visitTypeInsn(CHECKCAST, "java/lang/Long");
142-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Long", "longValue", "()J");
142+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Long", "longValue", "()J", false);
143143
break;
144144
case Type.DOUBLE:
145145
mv.visitTypeInsn(CHECKCAST, "java/lang/Double");
146-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D");
146+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Double", "doubleValue", "()D", false);
147147
break;
148148
case Type.ARRAY:
149149
mv.visitTypeInsn(CHECKCAST, fieldType.getInternalName());
@@ -164,35 +164,35 @@ protected static void autoUnBoxing2(MethodVisitor mv, Type fieldType) {
164164
switch (fieldType.getSort()) {
165165
case Type.BOOLEAN:
166166
mv.visitTypeInsn(CHECKCAST, "java/lang/Boolean");
167-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Boolean", "booleanValue", "()Z");
167+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Boolean", "booleanValue", "()Z", false);
168168
break;
169169
case Type.BYTE:
170170
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
171-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "byteValue", "()B");
171+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "byteValue", "()B", false);
172172
break;
173173
case Type.CHAR:
174174
mv.visitTypeInsn(CHECKCAST, "java/lang/Character");
175-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Character", "charValue", "()C");
175+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Character", "charValue", "()C", false);
176176
break;
177177
case Type.SHORT:
178178
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
179-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "shortValue", "()S");
179+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "shortValue", "()S", false);
180180
break;
181181
case Type.INT:
182182
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
183-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "intValue", "()I");
183+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "intValue", "()I", false);
184184
break;
185185
case Type.FLOAT:
186186
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
187-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "floatValue", "()F");
187+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "floatValue", "()F", false);
188188
break;
189189
case Type.LONG:
190190
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
191-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "longValue", "()J");
191+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "longValue", "()J", false);
192192
break;
193193
case Type.DOUBLE:
194194
mv.visitTypeInsn(CHECKCAST, "java/lang/Number");
195-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "doubleValue", "()D");
195+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Number", "doubleValue", "()D", false);
196196
break;
197197
case Type.ARRAY:
198198
mv.visitTypeInsn(CHECKCAST, fieldType.getInternalName());

‎accessors-smart/src/main/java/net/minidev/asm/BeansAccess.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ static public <P> BeansAccess<P> get(Class<P> type) {
7373
* to be access
7474
* @return the BeansAccess
7575
*/
76+
@SuppressWarnings("deprecation")
7677
static public <P> BeansAccess<P> get(Class<P> type, FieldFilter filter) {
7778
{
7879
@SuppressWarnings("unchecked")

‎accessors-smart/src/main/java/net/minidev/asm/BeansAccessBuilder.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public Class<?> bulid() {
117117
mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
118118
mv.visitCode();
119119
mv.visitVarInsn(ALOAD, 0);
120-
mv.visitMethodInsn(INVOKESPECIAL, METHOD_ACCESS_NAME, "<init>", "()V");
120+
mv.visitMethodInsn(INVOKESPECIAL, METHOD_ACCESS_NAME, "<init>", "()V", false);
121121
mv.visitInsn(RETURN);
122122
mv.visitMaxs(1, 1);
123123
mv.visitEnd();
@@ -192,7 +192,7 @@ public Class<?> bulid() {
192192
mv.visitFieldInsn(GETFIELD, classNameInternal, acc.getName(), fieldType.getDescriptor());
193193
} else {
194194
String sig = Type.getMethodDescriptor(acc.getter);
195-
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.getter.getName(), sig);
195+
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.getter.getName(), sig, false);
196196
}
197197
ASMUtil.autoBoxing(mv, fieldType);
198198
mv.visitInsn(ARETURN);
@@ -213,7 +213,7 @@ public Class<?> bulid() {
213213
if (acc.getter == null)
214214
throw new RuntimeException("no Getter for field " + acc.getName() + " in class " + this.className);
215215
String sig = Type.getMethodDescriptor(acc.getter);
216-
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.getter.getName(), sig);
216+
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.getter.getName(), sig, false);
217217
}
218218
ASMUtil.autoBoxing(mv, fieldType);
219219
mv.visitInsn(ARETURN);
@@ -244,7 +244,7 @@ public Class<?> bulid() {
244244
for (Accessor acc : accs) {
245245
mv.visitVarInsn(ALOAD, 2);
246246
mv.visitLdcInsn(acc.fieldName);
247-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z");
247+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z", false);
248248
mv.visitJumpInsn(IFEQ, labels[i]);
249249
internalSetFiled(mv, acc);
250250
mv.visitLabel(labels[i]);
@@ -270,7 +270,7 @@ public Class<?> bulid() {
270270
for (Accessor acc : accs) {
271271
mv.visitVarInsn(ALOAD, 2); // methodName
272272
mv.visitLdcInsn(acc.fieldName);
273-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z");
273+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "equals", "(Ljava/lang/Object;)Z", false);
274274
mv.visitJumpInsn(IFEQ, labels[i]);
275275
mv.visitVarInsn(ALOAD, 1); // object
276276
mv.visitTypeInsn(CHECKCAST, classNameInternal);
@@ -279,7 +279,7 @@ public Class<?> bulid() {
279279
mv.visitFieldInsn(GETFIELD, classNameInternal, acc.getName(), fieldType.getDescriptor());
280280
} else {
281281
String sig = Type.getMethodDescriptor(acc.getter);
282-
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.getter.getName(), sig);
282+
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.getter.getName(), sig, false);
283283
}
284284
ASMUtil.autoBoxing(mv, fieldType);
285285
mv.visitInsn(ARETURN);
@@ -302,7 +302,7 @@ public Class<?> bulid() {
302302
mv.visitCode();
303303
mv.visitTypeInsn(NEW, classNameInternal);
304304
mv.visitInsn(DUP);
305-
mv.visitMethodInsn(INVOKESPECIAL, classNameInternal, "<init>", "()V");
305+
mv.visitMethodInsn(INVOKESPECIAL, classNameInternal, "<init>", "()V", false);
306306
mv.visitInsn(ARETURN);
307307
mv.visitMaxs(2, 1);
308308
mv.visitEnd();
@@ -359,15 +359,15 @@ private void internalSetFiled(MethodVisitor mv, Accessor acc) {
359359
String clsSig = Type.getInternalName(conMtd.getDeclaringClass());
360360
String mtdName = conMtd.getName();
361361
String mtdSig = Type.getMethodDescriptor(conMtd);
362-
mv.visitMethodInsn(INVOKESTATIC, clsSig, mtdName, mtdSig);
362+
mv.visitMethodInsn(INVOKESTATIC, clsSig, mtdName, mtdSig, false);
363363
} else if (acc.isEnum()) {
364364
// builtIn Enum Conversion
365365
Label isNull = new Label();
366366
mv.visitJumpInsn(IFNULL, isNull);
367367
mv.visitVarInsn(ALOAD, 3);
368368
// mv.visitTypeInsn(CHECKCAST, "java/lang/String");
369-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "toString", "()Ljava/lang/String;");
370-
mv.visitMethodInsn(INVOKESTATIC, destClsName, "valueOf", "(Ljava/lang/String;)L" + destClsName + ";");
369+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "toString", "()Ljava/lang/String;", false);
370+
mv.visitMethodInsn(INVOKESTATIC, destClsName, "valueOf", "(Ljava/lang/String;)L" + destClsName + ";", false);
371371
mv.visitVarInsn(ASTORE, 3);
372372
mv.visitLabel(isNull);
373373
mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
@@ -380,7 +380,7 @@ private void internalSetFiled(MethodVisitor mv, Accessor acc) {
380380
Label isNull = new Label();
381381
mv.visitJumpInsn(IFNULL, isNull);
382382
mv.visitVarInsn(ALOAD, 3);
383-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "toString", "()Ljava/lang/String;");
383+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/Object", "toString", "()Ljava/lang/String;", false);
384384
mv.visitVarInsn(ASTORE, 3);
385385
mv.visitLabel(isNull);
386386
mv.visitFrame(Opcodes.F_SAME, 0, null, 0, null);
@@ -396,7 +396,7 @@ private void internalSetFiled(MethodVisitor mv, Accessor acc) {
396396
mv.visitFieldInsn(PUTFIELD, classNameInternal, acc.getName(), fieldType.getDescriptor());
397397
} else {
398398
String sig = Type.getMethodDescriptor(acc.setter);
399-
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.setter.getName(), sig);
399+
mv.visitMethodInsn(INVOKEVIRTUAL, classNameInternal, acc.setter.getName(), sig, false);
400400
}
401401
mv.visitInsn(RETURN);
402402
}
@@ -410,9 +410,9 @@ private void throwExIntParam(MethodVisitor mv, Class<?> exCls) {
410410
mv.visitInsn(DUP);
411411
mv.visitLdcInsn("mapping " + this.className + " failed to map field:");
412412
mv.visitVarInsn(ILOAD, 2);
413-
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "toString", "(I)Ljava/lang/String;");
414-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "concat", "(Ljava/lang/String;)Ljava/lang/String;");
415-
mv.visitMethodInsn(INVOKESPECIAL, exSig, "<init>", "(Ljava/lang/String;)V");
413+
mv.visitMethodInsn(INVOKESTATIC, "java/lang/Integer", "toString", "(I)Ljava/lang/String;", false);
414+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "concat", "(Ljava/lang/String;)Ljava/lang/String;", false);
415+
mv.visitMethodInsn(INVOKESPECIAL, exSig, "<init>", "(Ljava/lang/String;)V", false);
416416
mv.visitInsn(ATHROW);
417417
}
418418

@@ -425,8 +425,8 @@ private void throwExStrParam(MethodVisitor mv, Class<?> exCls) {
425425
mv.visitInsn(DUP);
426426
mv.visitLdcInsn("mapping " + this.className + " failed to map field:");
427427
mv.visitVarInsn(ALOAD, 2);
428-
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "concat", "(Ljava/lang/String;)Ljava/lang/String;");
429-
mv.visitMethodInsn(INVOKESPECIAL, exSig, "<init>", "(Ljava/lang/String;)V");
428+
mv.visitMethodInsn(INVOKEVIRTUAL, "java/lang/String", "concat", "(Ljava/lang/String;)Ljava/lang/String;", false);
429+
mv.visitMethodInsn(INVOKESPECIAL, exSig, "<init>", "(Ljava/lang/String;)V", false);
430430
mv.visitInsn(ATHROW);
431431
}
432432

‎accessors-smart/src/main/java/net/minidev/asm/DynamicClassLoader.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public static <T> Class<T> directLoad(Class<? extends T> parent, String clsName,
5050
return clzz;
5151
}
5252

53+
@SuppressWarnings("deprecation")
5354
public static <T> T directInstance(Class<? extends T> parent, String clsName, byte[] clsData) throws InstantiationException, IllegalAccessException {
5455
Class<T> clzz = directLoad(parent, clsName, clsData);
5556
return clzz.newInstance();

‎json-smart/src/main/java/net/minidev/json/JSONNavi.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ public int asInt() {
382382
/**
383383
* get the current object value as Integer if the current Object can not be
384384
* cast as Integer return null.
385+
* @return the current node value as an Integer
385386
*/
386387
public Integer asIntegerObj() {
387388
if (current == null)
@@ -459,6 +460,7 @@ public Boolean asBooleanObj() {
459460
/**
460461
* Set current value as Json Object You can also skip this call, Objects can
461462
* be create automatically.
463+
* @return the current node as an object
462464
*/
463465
@SuppressWarnings("unchecked")
464466
public JSONNavi<T> object() {
@@ -485,6 +487,8 @@ public JSONNavi<T> object() {
485487
/**
486488
* Set current value as Json Array You can also skip this call Arrays can be
487489
* create automatically.
490+
*
491+
* @return the current node as an array
488492
*/
489493
@SuppressWarnings("unchecked")
490494
public JSONNavi<T> array() {
@@ -510,6 +514,8 @@ public JSONNavi<T> array() {
510514

511515
/**
512516
* set current value as Number
517+
* @param num new value for the current node
518+
* @return this for code chaining
513519
*/
514520
public JSONNavi<T> set(Number num) {
515521
if (failure)
@@ -521,6 +527,9 @@ public JSONNavi<T> set(Number num) {
521527

522528
/**
523529
* set current value as Boolean
530+
* @param num new value for the current node
531+
*
532+
* @return this for code chaining
524533
*/
525534
public JSONNavi<T> set(Boolean bool) {
526535
if (failure)
@@ -532,6 +541,9 @@ public JSONNavi<T> set(Boolean bool) {
532541

533542
/**
534543
* set current value as String
544+
* @param text text value
545+
*
546+
* @return this for code chaining
535547
*/
536548
public JSONNavi<T> set(String text) {
537549
if (failure)

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<plugin> <!-- updated on 29/07/2015 -->
9696
<groupId>org.apache.maven.plugins</groupId>
9797
<artifactId>maven-javadoc-plugin</artifactId>
98-
<version>2.10.3</version>
98+
<version>2.10.4</version>
9999
<!-- ONLY NEEDED With jdk 1.7+ -->
100100
<configuration>
101101
<failOnError>false</failOnError>
@@ -219,7 +219,7 @@
219219
<plugin>
220220
<groupId>org.apache.maven.plugins</groupId>
221221
<artifactId>maven-release-plugin</artifactId>
222-
<version>2.5.2</version>
222+
<version>2.5.3</version>
223223
<configuration>
224224
<mavenExecutorId>forked-path</mavenExecutorId>
225225
<arguments>-Psonatype-oss-release</arguments>

0 commit comments

Comments
 (0)