You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by mb...@apache.org on 2022/07/10 12:57:57 UTC
[db-jdo] 03/05: JDO-817 removing compiler warnings: Redundant String operation
This is an automated email from the ASF dual-hosted git repository.
mbo pushed a commit to branch tck-compiler-warnings
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 4eb8d628c9721cb4b7b87cd3ab35d1a0d2531963
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 10 14:15:57 2022 +0200
JDO-817 removing compiler warnings: Redundant String operation
---
.../tck/models/fieldtypes/TestFieldsOfString.java | 6 ++--
.../apache/jdo/tck/models/fieldtypes/TestUtil.java | 20 +++++++-------
.../org/apache/jdo/tck/pc/fieldtypes/AllTypes.java | 10 +++----
.../jdo/tck/pc/fieldtypes/FieldsOfString.java | 32 +++++++++++-----------
.../apache/jdo/tck/pc/fieldtypes/SimpleClass.java | 2 +-
.../jdo/tck/query/jdoql/operators/Equality.java | 12 ++++----
.../jdo/tck/query/jdoql/operators/GreaterThan.java | 12 ++++----
.../query/jdoql/operators/GreaterThanOrEqual.java | 12 ++++----
.../jdo/tck/query/jdoql/operators/LessThan.java | 12 ++++----
.../tck/query/jdoql/operators/LessThanOrEqual.java | 12 ++++----
.../jdo/tck/query/jdoql/operators/NotEquals.java | 12 ++++----
.../apache/jdo/tck/query/sql/ExecuteWithMap.java | 8 +++---
12 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
index 3ac0607a..16ff42ff 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfString.java
@@ -76,8 +76,8 @@ public class TestFieldsOfString extends JDO_Test {
{
Transaction tx = pm.currentTransaction();
int i, n;
- String firstValue = new String("Hello");
- String secondValue = new String("Hello World");
+ String firstValue = "Hello";
+ String secondValue = "Hello World";
tx.begin();
FieldsOfString pi = new FieldsOfString();
pi.identifier = 1;
@@ -126,7 +126,7 @@ public class TestFieldsOfString extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfString.fieldSpecs[i] +
", expected value " + value +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
index 52f106ef..ae4bc6a2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestUtil.java
@@ -126,11 +126,11 @@ public class TestUtil {
vec.add(4, new SimpleClass(5, "World"));
break;
case(3):
- vec.add(0, new String("Hello"));
- vec.add(1, new String("Welcome"));
- vec.add(2, new String("To The"));
- vec.add(3, new String("Beautiful"));
- vec.add(4, new String("World"));
+ vec.add(0, "Hello");
+ vec.add(1, "Welcome");
+ vec.add(2, "To The");
+ vec.add(3, "Beautiful");
+ vec.add(4, "World");
break;
case(4):
vec.add(0, new Date(2007908));
@@ -235,11 +235,11 @@ public class TestUtil {
vec.add(4, new SimpleClass(5, "Strawberries"));
break;
case(3):
- vec.add(0, new String("Peaches"));
- vec.add(1, new String("Oranges"));
- vec.add(2, new String("Blue Berries"));
- vec.add(3, new String("Apples"));
- vec.add(4, new String("Strawberries"));
+ vec.add(0, "Peaches");
+ vec.add(1, "Oranges");
+ vec.add(2, "Blue Berries");
+ vec.add(3, "Apples");
+ vec.add(4, "Strawberries");
break;
case(4):
vec.add(0, new Date(54545));
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
index e744d485..6c35c0ef 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/AllTypes.java
@@ -130,11 +130,11 @@ public class AllTypes {
};
public static final String[] String_values = {
- new String(""), new String("hello world"),
- new String("JDO has a very nice persistence API"), new String("JDO"),
- new String("Java"), new String("abcde"),
- new String("abcdef"), new String("JDO is a breeze to use"),
- new String("Java"), new String("Long-live JDO")
+ "", "hello world",
+ "JDO has a very nice persistence API", "JDO",
+ "Java", "abcde",
+ "abcdef", "JDO is a breeze to use",
+ "Java", "Long-live JDO"
};
public static final Locale[] Locale_values = {
Locale.US, Locale.UK, Locale.FRANCE, Locale.GERMANY, Locale.CANADA,
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
index ce40e0c6..0d136f93 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/FieldsOfString.java
@@ -36,7 +36,7 @@ public class FieldsOfString {
private transient String String12;
private transient String String13;
private transient String String14;
- private final String String15 = new String("JDO TCK");
+ private final String String15 = "JDO TCK";
private volatile String String16;
private volatile String String17;
private volatile String String18;
@@ -46,16 +46,16 @@ public class FieldsOfString {
private volatile String String22;
private volatile String String23;
private static transient String String24;
- private static final String String25 = new String("JDO TCK");
+ private static final String String25 = "JDO TCK";
private static volatile String String26;
- private transient final String String27 = new String("JDO TCK");
+ private transient final String String27 = "JDO TCK";
private transient volatile String String28;
private transient volatile String String29;
private transient volatile String String30;
private transient volatile String String31;
private transient volatile String String32;
private transient volatile String String33;
- private static transient final String String34 = new String("JDO TCK");
+ private static transient final String String34 = "JDO TCK";
private static transient volatile String String35;
public String String36;
public String String37;
@@ -72,7 +72,7 @@ public class FieldsOfString {
public transient String String48;
public transient String String49;
public transient String String50;
- public final String String51 = new String("JDO TCK");
+ public final String String51 = "JDO TCK";
public volatile String String52;
public volatile String String53;
public volatile String String54;
@@ -82,16 +82,16 @@ public class FieldsOfString {
public volatile String String58;
public volatile String String59;
public static transient String String60;
- public static final String String61 = new String("JDO TCK");
+ public static final String String61 = "JDO TCK";
public static volatile String String62;
- public transient final String String63 = new String("JDO TCK");
+ public transient final String String63 = "JDO TCK";
public transient volatile String String64;
public transient volatile String String65;
public transient volatile String String66;
public transient volatile String String67;
public transient volatile String String68;
public transient volatile String String69;
- public static transient final String String70 = new String("JDO TCK");
+ public static transient final String String70 = "JDO TCK";
public static transient volatile String String71;
protected String String72;
protected String String73;
@@ -108,7 +108,7 @@ public class FieldsOfString {
protected transient String String84;
protected transient String String85;
protected transient String String86;
- protected final String String87 = new String("JDO TCK");
+ protected final String String87 = "JDO TCK";
protected volatile String String88;
protected volatile String String89;
protected volatile String String90;
@@ -118,16 +118,16 @@ public class FieldsOfString {
protected volatile String String94;
protected volatile String String95;
protected static transient String String96;
- protected static final String String97 = new String("JDO TCK");
+ protected static final String String97 = "JDO TCK";
protected static volatile String String98;
- protected transient final String String99 = new String("JDO TCK");
+ protected transient final String String99 = "JDO TCK";
protected transient volatile String String100;
protected transient volatile String String101;
protected transient volatile String String102;
protected transient volatile String String103;
protected transient volatile String String104;
protected transient volatile String String105;
- protected static transient final String String106 = new String("JDO TCK");
+ protected static transient final String String106 = "JDO TCK";
protected static transient volatile String String107;
String String108;
String String109;
@@ -144,7 +144,7 @@ public class FieldsOfString {
transient String String120;
transient String String121;
transient String String122;
- final String String123 = new String("JDO TCK");
+ final String String123 = "JDO TCK";
volatile String String124;
volatile String String125;
volatile String String126;
@@ -154,16 +154,16 @@ public class FieldsOfString {
volatile String String130;
volatile String String131;
static transient String String132;
- static final String String133 = new String("JDO TCK");
+ static final String String133 = "JDO TCK";
static volatile String String134;
- transient final String String135 = new String("JDO TCK");
+ transient final String String135 = "JDO TCK";
transient volatile String String136;
transient volatile String String137;
transient volatile String String138;
transient volatile String String139;
transient volatile String String140;
transient volatile String String141;
- static transient final String String142 = new String("JDO TCK");
+ static transient final String String142 = "JDO TCK";
static transient volatile String String143;
public static final boolean [] isPersistent = {
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
index b0e4f104..1f3349d0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/fieldtypes/SimpleClass.java
@@ -32,7 +32,7 @@ public class SimpleClass implements Serializable, SimpleInterface, Comparable<Si
}
private long id = newId();
private int intField=0;
- private String stringField = new String("Test");
+ private String stringField = "Test";
public SimpleClass(){};
public SimpleClass(int intField, String stringField)
{
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
index cf51575d..012a4656 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/Equality.java
@@ -744,12 +744,12 @@ public class Equality extends ComparisonTests {
run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-25.5), 1);
run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(-25.5), 1);
- run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), 1);
- run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), 0);
- alltypes.setString(new String("abcde"));
- run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), 1);
- run_StringQuery(String_filterVal1, null, null, new String("Java"), 2);
- run_StringQuery(String_filterVal2, null, null, new String(""), 1);
+ run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", 1);
+ run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", 0);
+ alltypes.setString("abcde");
+ run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", 1);
+ run_StringQuery(String_filterVal1, null, null, "Java", 2);
+ run_StringQuery(String_filterVal2, null, null, "", 1);
run_LocaleQuery(Locale_filterL, LocaleParameter, Locale.CANADA_FRENCH, Locale.CANADA_FRENCH, 0);
run_LocaleQuery(Locale_filterR, LocaleParameter, Locale.US, Locale.US, 1);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
index e8738a72..8c3ea39e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThan.java
@@ -699,12 +699,12 @@ public class GreaterThan extends ComparisonTests {
run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 1);
run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 4);
- run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 1);
- run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 9);
- alltypes.setString(new String("abcde"));
- run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 7);
- run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 4);
- run_StringQuery(String_filterVal2, null, null, new String(""), false, 9);
+ run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 1);
+ run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 9);
+ alltypes.setString("abcde");
+ run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 7);
+ run_StringQuery(String_filterVal1, null, null, "Java", false, 4);
+ run_StringQuery(String_filterVal2, null, null, "", false, 9);
BigDecimal bd = new BigDecimal("100.0");
run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 4);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
index e3080b82..3f8b7549 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/GreaterThanOrEqual.java
@@ -698,12 +698,12 @@ public class GreaterThanOrEqual extends ComparisonTests {
run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 1);
run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 6);
- run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 2);
- run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 9);
- alltypes.setString(new String("abcde"));
- run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 8);
- run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 6);
- run_StringQuery(String_filterVal2, null, null, new String(""), false, 10);
+ run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 2);
+ run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 9);
+ alltypes.setString("abcde");
+ run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 8);
+ run_StringQuery(String_filterVal1, null, null, "Java", false, 6);
+ run_StringQuery(String_filterVal2, null, null, "", false, 10);
BigDecimal bd = new BigDecimal("100.0");
run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 6);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
index 0ac16e34..3b1d873b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThan.java
@@ -698,12 +698,12 @@ public class LessThan extends ComparisonTests {
run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 9);
run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 4);
- run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 8);
- run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 1);
- alltypes.setString(new String("abcde"));
- run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 2);
- run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 4);
- run_StringQuery(String_filterVal2, null, null, new String(""), false, 0);
+ run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 8);
+ run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 1);
+ alltypes.setString("abcde");
+ run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 2);
+ run_StringQuery(String_filterVal1, null, null, "Java", false, 4);
+ run_StringQuery(String_filterVal2, null, null, "", false, 0);
BigDecimal bd = new BigDecimal("100.0");
run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 4);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
index 25cd4c74..fb22ed5b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/LessThanOrEqual.java
@@ -703,12 +703,12 @@ public class LessThanOrEqual extends ComparisonTests {
run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(-999999999999.0), true, 9);
run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), false, 6);
- run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), true, 9);
- run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), false, 1);
- alltypes.setString(new String("abcde"));
- run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), true, 3);
- run_StringQuery(String_filterVal1, null, null, new String("Java"), false, 6);
- run_StringQuery(String_filterVal2, null, null, new String(""), false, 1);
+ run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", true, 9);
+ run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", false, 1);
+ alltypes.setString("abcde");
+ run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", true, 3);
+ run_StringQuery(String_filterVal1, null, null, "Java", false, 6);
+ run_StringQuery(String_filterVal2, null, null, "", false, 1);
BigDecimal bd = new BigDecimal("100.0");
run_BigDecimalQuery(BigDecimal_filterL, BigDecimalParameter, bd, bd, true, 6);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
index 8cfbc134..64025415 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/jdoql/operators/NotEquals.java
@@ -742,12 +742,12 @@ public class NotEquals extends ComparisonTests {
run_DoubleQuery(Double_filterObj, AllTypesParameter, alltypes, Double.valueOf(0.0), 9);
run_DoubleQuery(Double_filterVal, null, null, Double.valueOf(100.0), 8);
- run_StringQuery(String_filterL, StringParameter, new String("JDO"), new String("JDO"), 9);
- run_StringQuery(String_filterR, StringParameter, new String("JDBC"), new String("JDBC"), 10);
- alltypes.setString(new String("abcde"));
- run_StringQuery(String_filterObj, AllTypesParameter, alltypes, new String("abcde"), 9);
- run_StringQuery(String_filterVal1, null, null, new String("Java"), 8);
- run_StringQuery(String_filterVal2, null, null, new String(""), 9);
+ run_StringQuery(String_filterL, StringParameter, "JDO", "JDO", 9);
+ run_StringQuery(String_filterR, StringParameter, "JDBC", "JDBC", 10);
+ alltypes.setString("abcde");
+ run_StringQuery(String_filterObj, AllTypesParameter, alltypes, "abcde", 9);
+ run_StringQuery(String_filterVal1, null, null, "Java", 8);
+ run_StringQuery(String_filterVal2, null, null, "", 9);
run_LocaleQuery(Locale_filterL, LocaleParameter, Locale.CANADA_FRENCH, Locale.CANADA_FRENCH, 10);
run_LocaleQuery(Locale_filterR, LocaleParameter, Locale.US, Locale.US, 9);
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
index 76e0ff8d..20789f0e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/sql/ExecuteWithMap.java
@@ -118,10 +118,10 @@ public class ExecuteWithMap extends QueryTest {
illegalMapStartsWithZero.put(Integer.valueOf(2), "emp2Middle");
illegalMapStartsWithZero.put(Integer.valueOf(3), "New York");
- illegalMapStringKeys.put(new String("1dog"), "emp2First");
- illegalMapStringKeys.put(new String("2dog"), "emp2Last");
- illegalMapStringKeys.put(new String("3dog"), "emp2Middle");
- illegalMapStringKeys.put(new String("4dog"), "New York");
+ illegalMapStringKeys.put("1dog", "emp2First");
+ illegalMapStringKeys.put("2dog", "emp2Last");
+ illegalMapStringKeys.put("3dog", "emp2Middle");
+ illegalMapStringKeys.put("4dog", "New York");
};
private static final Map<Object, Object>[] parameterMap = new Map[]{hm1, hm2, hm3, hm4};