Skip to content

Commit

Permalink
changed all occurrences of new XXX to XXX.valueOf for boxed numeric t…
Browse files Browse the repository at this point in the history 
…ypes XXX
  • Loading branch information
@adinn
adinn committed Apr 14, 2016
1 parent 8e64e73 commit bcbbb52
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions agent/src/main/java/org/jboss/byteman/agent/Transformer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1404,8 +1404,8 @@ private static boolean ensureDumpDirectory(String fileName)
* enabled
*/
private static ThreadLocal<Integer> isEnabled = new ThreadLocal<Integer>();
private final static Integer DISABLED_USER = new Integer(0);
private final static Integer DISABLED = new Integer(1);
private final static Integer DISABLED_USER = Integer.valueOf(0);
private final static Integer DISABLED = Integer.valueOf(1);
private final static Integer ENABLED = null;

}
8 changes: 4 additions & 4 deletions agent/src/main/java/org/jboss/byteman/agent/adapter/RuleGeneratorAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ public void push(final int value) {
} else if (value >= Short.MIN_VALUE && value <= Short.MAX_VALUE) {
visitIntInsn(Opcodes.SIPUSH, value);
} else {
visitLdcInsn(new Integer(value));
visitLdcInsn(Integer.valueOf(value));
}
}

Expand All @@ -346,7 +346,7 @@ public void push(final long value) {
if (value == 0L || value == 1L) {
visitInsn(Opcodes.LCONST_0 + (int) value);
} else {
visitLdcInsn(new Long(value));
visitLdcInsn(Long.valueOf(value));
}
}

Expand All @@ -360,7 +360,7 @@ public void push(final float value) {
if (bits == 0L || bits == 0x3f800000 || bits == 0x40000000) { // 0..2
visitInsn(Opcodes.FCONST_0 + (int) value);
} else {
visitLdcInsn(new Float(value));
visitLdcInsn(Float.valueOf(value));
}
}

Expand All @@ -374,7 +374,7 @@ public void push(final double value) {
if (bits == 0L || bits == 0x3ff0000000000000L) { // +0.0d and 1.0d
visitInsn(Opcodes.DCONST_0 + (int) value);
} else {
visitLdcInsn(new Double(value));
visitLdcInsn(Double.valueOf(value));
}
}

Expand Down
18 changes: 9 additions & 9 deletions agent/src/main/java/org/jboss/byteman/rule/expression/ArithmeticExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ public Object interpret(HelperAdapter helper)
Number value1;
Number value2;
if (objValue1 instanceof Character) {
value1 = new Integer((Character)objValue1);
value1 = Integer.valueOf((Character)objValue1);
} else {
value1 = (Number)objValue1;
}
if (objValue2 instanceof Character) {
value2 = new Integer((Character)objValue2);
value2 = Integer.valueOf((Character)objValue2);
} else {
value2 = (Number)objValue2;
}
Expand Down Expand Up @@ -105,7 +105,7 @@ public Object interpret(HelperAdapter helper)
result = 0;
break;
}
return new Byte(result);
return Byte.valueOf(result);
} else if (type == type.S) {
short s1 = value1.shortValue();
short s2 = value2.shortValue();
Expand All @@ -131,7 +131,7 @@ public Object interpret(HelperAdapter helper)
result = 0;
break;
}
return new Short(result);
return Short.valueOf(result);
} else if (type == type.I) {
int i1 = value1.intValue();
int i2 = value2.intValue();
Expand All @@ -157,7 +157,7 @@ public Object interpret(HelperAdapter helper)
result = 0;
break;
}
return new Integer(result);
return Integer.valueOf(result);
} else if (type == type.J) {
long l1 = value1.longValue();
long l2 = value2.longValue();
Expand All @@ -183,7 +183,7 @@ public Object interpret(HelperAdapter helper)
result = 0;
break;
}
return new Long(result);
return Long.valueOf(result);
} else if (type == type.F) {
float f1 = value1.floatValue();
float f2 = value2.floatValue();
Expand All @@ -209,7 +209,7 @@ public Object interpret(HelperAdapter helper)
result = 0;
break;
}
return new Float(result);
return Float.valueOf(result);
} else if (type == type.D) {
double d1 = value1.doubleValue();
double d2 = value2.doubleValue();
Expand All @@ -235,7 +235,7 @@ public Object interpret(HelperAdapter helper)
result = 0;
break;
}
return new Double(result);
return Double.valueOf(result);
} else { // (type == type.C)
// use integers here but be careful about conversions
int s1 = value1.intValue();
Expand All @@ -262,7 +262,7 @@ public Object interpret(HelperAdapter helper)
result = 0;
break;
}
return new Integer(result);
return Integer.valueOf(result);
}
} catch (ExecuteException e) {
throw e;
Expand Down
10 changes: 5 additions & 5 deletions agent/src/main/java/org/jboss/byteman/rule/expression/BitExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Byte(result);
return Byte.valueOf(result);
} else if (type == type.S) {
short s1 = value1.shortValue();
short s2 = value2.shortValue();
Expand All @@ -113,7 +113,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Short(result);
return Short.valueOf(result);
} else if (type == type.I) {
int i1 = value1.intValue();
int i2 = value2.intValue();
Expand All @@ -133,7 +133,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Integer(result);
return Integer.valueOf(result);
} else if (type == type.J) {
long l1 = value1.longValue();
long l2 = value2.longValue();
Expand All @@ -153,7 +153,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Long(result);
return Long.valueOf(result);
} else { // (type == type.C)
// use integers here but be careful about conversions
int s1 = value1.intValue();
Expand All @@ -174,7 +174,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Integer(result);
return Integer.valueOf(result);
}
} catch (ExecuteException e) {
throw e;
Expand Down
2 changes: 1 addition & 1 deletion agent/src/main/java/org/jboss/byteman/rule/expression/MinusExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
Object objValue = (Object)getOperand(0).interpret(helper);
Number value;
if (objValue instanceof Character) {
value = new Integer((Character)objValue);
value = Integer.valueOf((Character)objValue);
} else {
value = (Number)objValue;
}
Expand Down
18 changes: 9 additions & 9 deletions agent/src/main/java/org/jboss/byteman/rule/expression/PlusExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,48 +80,48 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
return s1 + s2;
} else {
if (value1 instanceof Character) {
value1 = new Integer((Character)value1);
value1 = Integer.valueOf((Character)value1);
}
if (value2 instanceof Character) {
value2 = new Integer((Character)value2);
value2 = Integer.valueOf((Character)value2);
}
Number n1 = (Number)value1;
Number n2 = (Number)value2;
if (type == Type.B) {
byte b1 = n1.byteValue();
byte b2 = n2.byteValue();
byte result = (byte)(b1 + b2);
return new Byte(result);
return Byte.valueOf(result);
} else if (type == Type.S) {
short s1 = n1.shortValue();
short s2 = n2.shortValue();
short result = (short)(s1 + s2);
return new Short(result);
return Short.valueOf(result);
} else if (type == Type.I) {
int i1 = n1.intValue();
int i2 = n2.intValue();
int result = (i1 + i2);
return new Integer(result);
return Integer.valueOf(result);
} else if (type == Type.J) {
long l1 = n1.longValue();
long l2 = n2.longValue();
long result = (l1 + l2);
return new Long(result);
return Long.valueOf(result);
} else if (type == Type.F) {
float f1 = n1.floatValue();
float f2 = n2.floatValue();
float result = (f1 + f2);
return new Float(result);
return Float.valueOf(result);
} else if (type == Type.D) {
double d1 = n1.doubleValue();
double d2 = n2.doubleValue();
double result = (d1 + d2);
return new Double(result);
return Double.valueOf(result);
} else { // type == Type.C
char c1 = (char)n1.intValue();
char c2 = (char)n2.intValue();
char result = (char)(c1 + c2);
return new Character(result);
return Character.valueOf(result);
}
}
}
Expand Down
26 changes: 13 additions & 13 deletions agent/src/main/java/org/jboss/byteman/rule/expression/ReturnExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,42 +119,42 @@ public Object interpret(HelperAdapter helper) throws ExecuteException
if (type == Type.C && subtype != Type.C) {
// ok, transform Number to a Character
int number = ((Number)value).intValue();
value = new Character((char)number);
value = Character.valueOf((char)number);
} else if (subtype == Type.C) {
// ok, transform Character to a boxed Numeric if necessary
char c = ((Character)value).charValue();
if (type == Type.B) {
value = new Byte((byte)c);
value = Byte.valueOf((byte)c);
} else if (type == Type.S) {
value = new Short((short)c);
value = Short.valueOf((short)c);
} else if (type == Type.I) {
value = new Integer((int)c);
value = Integer.valueOf((int)c);
} else if (type == Type.J) {
value = new Long((int)c);
value = Long.valueOf((int)c);
} else if (type == Type.F) {
value = new Float((int)c);
value = Float.valueOf((int)c);
} else if (type == Type.D) {
value = new Double((int)c);
value = Double.valueOf((int)c);
}
} else {
if (type == Type.B && subtype != Type.B) {
Number number = (Number)value;
value = new Byte(number.byteValue());
value = Byte.valueOf(number.byteValue());
} else if (type == Type.S && subtype != Type.S) {
Number number = (Number)value;
value = new Short(number.shortValue());
value = Short.valueOf(number.shortValue());
} else if (type == Type.I && subtype != Type.I) {
Number number = (Number)value;
value = new Integer(number.intValue());
value = Integer.valueOf(number.intValue());
} else if (type == Type.J && subtype != Type.J) {
Number number = (Number)value;
value = new Long(number.longValue());
value = Long.valueOf(number.longValue());
} else if (type == Type.F && subtype != Type.F) {
Number number = (Number)value;
value = new Float(number.floatValue());
value = Float.valueOf(number.floatValue());
} else if (type == Type.D && subtype != Type.D) {
Number number = (Number)value;
value = new Double(number.doubleValue());
value = Double.valueOf(number.doubleValue());
}
}
}
Expand Down
8 changes: 4 additions & 4 deletions agent/src/main/java/org/jboss/byteman/rule/expression/ShiftExpression.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Byte(result);
return Byte.valueOf(result);
} else if (type == type.S) {
short s1 = value1.shortValue();
short result;
Expand All @@ -113,7 +113,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Short(result);
return Short.valueOf(result);
} else if (type == type.I) {
int i1 = value1.intValue();
int result;
Expand All @@ -132,7 +132,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Integer(result);
return Integer.valueOf(result);
} else { // if (type == type.J) {
long l1 = value1.longValue();
long result;
Expand All @@ -151,7 +151,7 @@ public Object interpret(HelperAdapter helper) throws ExecuteException {
result = 0;
break;
}
return new Long(result);
return Long.valueOf(result);
}
} catch (ExecuteException e) {
throw e;
Expand Down
2 changes: 1 addition & 1 deletion agent/src/test/java/org/jboss/byteman/tests/bugfixes/TestBooleanComparisons.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public void test()

try {
log("calling TestBooleanComparisons.triggerMethod");
triggerMethod(true, false, new Boolean(true), new Boolean(false));
triggerMethod(true, false, Boolean.valueOf(true), Boolean.valueOf(false));
log("called TestBooleanComparisons.triggerMethod");
} catch (Exception e) {
log(e);
Expand Down

0 comments on commit bcbbb52

Please sign in to comment.