This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-jms.git
The following commit(s) were added to refs/heads/main by this push:
new a6f08b6 QPIDJMS-537: replace Float/Double constructor usage now
marked deprecated-for-removal in Java 16
a6f08b6 is described below
commit a6f08b6d58ba6db0d34beeac470d3d702f93f76d
Author: Robbie Gemmell <rob...@apache.org>
AuthorDate: Tue May 11 17:49:37 2021 +0100
QPIDJMS-537: replace Float/Double constructor usage now marked
deprecated-for-removal in Java 16
---
.../jms/selector/filter/ArithmeticExpression.java | 10 ++++----
.../jms/selector/filter/ComparisonExpression.java | 28 +++++++++++-----------
.../jms/selector/filter/ConstantExpression.java | 2 +-
.../qpid/jms/selector/filter/UnaryExpression.java | 4 ++--
4 files changed, 22 insertions(+), 22 deletions(-)
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
index 01c3b55..aab9181 100755
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ArithmeticExpression.java
@@ -115,7 +115,7 @@ public abstract class ArithmeticExpression extends
BinaryExpression {
case LONG:
return Long.valueOf(left.longValue() + right.longValue());
default:
- return new Double(left.doubleValue() + right.doubleValue());
+ return Double.valueOf(left.doubleValue() + right.doubleValue());
}
}
@@ -126,7 +126,7 @@ public abstract class ArithmeticExpression extends
BinaryExpression {
case LONG:
return Long.valueOf(left.longValue() - right.longValue());
default:
- return new Double(left.doubleValue() - right.doubleValue());
+ return Double.valueOf(left.doubleValue() - right.doubleValue());
}
}
@@ -137,16 +137,16 @@ public abstract class ArithmeticExpression extends
BinaryExpression {
case LONG:
return Long.valueOf(left.longValue() * right.longValue());
default:
- return new Double(left.doubleValue() * right.doubleValue());
+ return Double.valueOf(left.doubleValue() * right.doubleValue());
}
}
protected Number divide(Number left, Number right) {
- return new Double(left.doubleValue() / right.doubleValue());
+ return Double.valueOf(left.doubleValue() / right.doubleValue());
}
protected Number mod(Number left, Number right) {
- return new Double(left.doubleValue() % right.doubleValue());
+ return Double.valueOf(left.doubleValue() % right.doubleValue());
}
private int numberType(Number left, Number right) {
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
index 2154b66..9f544b4 100755
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ComparisonExpression.java
@@ -361,9 +361,9 @@ public abstract class ComparisonExpression extends
BinaryExpression implements B
} else if (rc == Long.class) {
lv = Long.valueOf(((Number)lv).longValue());
} else if (rc == Float.class) {
- lv = new Float(((Number)lv).floatValue());
+ lv = Float.valueOf(((Number)lv).floatValue());
} else if (rc == Double.class) {
- lv = new Double(((Number)lv).doubleValue());
+ lv = Double.valueOf(((Number)lv).doubleValue());
} else {
return Boolean.FALSE;
}
@@ -373,9 +373,9 @@ public abstract class ComparisonExpression extends
BinaryExpression implements B
} else if (rc == Long.class) {
lv = Long.valueOf(((Number)lv).longValue());
} else if (rc == Float.class) {
- lv = new Float(((Number)lv).floatValue());
+ lv = Float.valueOf(((Number)lv).floatValue());
} else if (rc == Double.class) {
- lv = new Double(((Number)lv).doubleValue());
+ lv = Double.valueOf(((Number)lv).doubleValue());
} else {
return Boolean.FALSE;
}
@@ -383,9 +383,9 @@ public abstract class ComparisonExpression extends
BinaryExpression implements B
if (rc == Long.class) {
lv = Long.valueOf(((Number)lv).longValue());
} else if (rc == Float.class) {
- lv = new Float(((Number)lv).floatValue());
+ lv = Float.valueOf(((Number)lv).floatValue());
} else if (rc == Double.class) {
- lv = new Double(((Number)lv).doubleValue());
+ lv = Double.valueOf(((Number)lv).doubleValue());
} else {
return Boolean.FALSE;
}
@@ -393,29 +393,29 @@ public abstract class ComparisonExpression extends
BinaryExpression implements B
if (rc == Integer.class) {
rv = Long.valueOf(((Number)rv).longValue());
} else if (rc == Float.class) {
- lv = new Float(((Number)lv).floatValue());
+ lv = Float.valueOf(((Number)lv).floatValue());
} else if (rc == Double.class) {
- lv = new Double(((Number)lv).doubleValue());
+ lv = Double.valueOf(((Number)lv).doubleValue());
} else {
return Boolean.FALSE;
}
} else if (lc == Float.class) {
if (rc == Integer.class) {
- rv = new Float(((Number)rv).floatValue());
+ rv = Float.valueOf(((Number)rv).floatValue());
} else if (rc == Long.class) {
- rv = new Float(((Number)rv).floatValue());
+ rv = Float.valueOf(((Number)rv).floatValue());
} else if (rc == Double.class) {
- lv = new Double(((Number)lv).doubleValue());
+ lv = Double.valueOf(((Number)lv).doubleValue());
} else {
return Boolean.FALSE;
}
} else if (lc == Double.class) {
if (rc == Integer.class) {
- rv = new Double(((Number)rv).doubleValue());
+ rv = Double.valueOf(((Number)rv).doubleValue());
} else if (rc == Long.class) {
- rv = new Double(((Number)rv).doubleValue());
+ rv = Double.valueOf(((Number)rv).doubleValue());
} else if (rc == Float.class) {
- rv = new Double(((Number)rv).doubleValue());
+ rv = Double.valueOf(((Number)rv).doubleValue());
} else {
return Boolean.FALSE;
}
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java
index 89c61e3..3e372fa 100755
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/ConstantExpression.java
@@ -86,7 +86,7 @@ public class ConstantExpression implements Expression {
}
public static ConstantExpression createFloat(String text) {
- Number value = new Double(text);
+ Number value = Double.valueOf(text);
return new ConstantExpression(value);
}
diff --git
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
index a32c0ea..65529f7 100755
---
a/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
+++
b/qpid-jms-client/src/main/java/org/apache/qpid/jms/selector/filter/UnaryExpression.java
@@ -184,9 +184,9 @@ public abstract class UnaryExpression implements Expression
{
} else if (clazz == Long.class) {
return Long.valueOf(-left.longValue());
} else if (clazz == Float.class) {
- return new Float(-left.floatValue());
+ return Float.valueOf(-left.floatValue());
} else if (clazz == Double.class) {
- return new Double(-left.doubleValue());
+ return Double.valueOf(-left.doubleValue());
} else if (clazz == BigDecimal.class) {
// We usually get a big decimal when we have Long.MIN_VALUE
constant in
// the Selector. Long.MIN_VALUE is too big to store in a Long as a
positive
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
