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 22:21:31 UTC
[db-jdo] 01/02: JDO-817 removing compiler warnings: unnecessary call to toString + unnecessary conversion to String
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 4305f04251bd28ac9dc6f346abed4c76d9014e80
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 10 20:59:23 2022 +0200
JDO-817 removing compiler warnings: unnecessary call to toString + unnecessary conversion to String
---
.../java/org/apache/jdo/tck/api/SignatureTest.java | 6 ++---
.../AbstractInstanceLifecycleListener.java | 2 +-
.../apache/jdo/tck/api/jdohelper/GetObjectIds.java | 12 ++++------
.../persistencecapable/NewObjectIdInstance.java | 2 +-
.../OneInstanceOfObjectPerPersistenceManager.java | 2 +-
.../api/persistencemanager/OptimisticFailure.java | 4 ++--
.../cache/RefreshAllNoParameterSideEffects.java | 4 ++--
.../cache/RefreshAllSideEffects.java | 4 ++--
.../persistencemanager/detach/DetachSerialize.java | 4 ++--
.../nullargs/PersistenceManagerNullsTest.java | 26 +++++++++++-----------
.../persistencemanagerfactory/AbstractGetPMF.java | 2 +-
.../AfterCloseGetPMThrowsException.java | 2 +-
.../AfterCloseSetMethodsThrowException.java | 6 ++---
...erGetPersistenceManagerNoSetMethodsSucceed.java | 4 ++--
.../tck/api/persistencemanagerfactory/Close.java | 2 +-
.../CloseFailsIfTransactionActive.java | 8 +++----
...seWithoutPermissionThrowsSecurityException.java | 2 +-
.../metadata/GetMetadataTest.java | 2 +-
...tIdNotModifiedWhenObjectIdInstanceModified.java | 2 +-
.../models/fieldtypes/TestArrayCollections.java | 2 +-
.../fieldtypes/TestArrayListCollections.java | 4 ++--
.../fieldtypes/TestCollectionCollections.java | 2 +-
.../models/fieldtypes/TestFieldsOfBigDecimal.java | 2 +-
.../models/fieldtypes/TestFieldsOfBigInteger.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfBoolean.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfByte.java | 2 +-
.../models/fieldtypes/TestFieldsOfCharacter.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfDate.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfDouble.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfFloat.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfInteger.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfLocale.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfLong.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfObject.java | 2 +-
.../tck/models/fieldtypes/TestFieldsOfShort.java | 2 +-
.../models/fieldtypes/TestFieldsOfSimpleEnum.java | 2 +-
.../TestHashMapStringKeyCollections.java | 4 ++--
.../TestHashMapStringValueCollections.java | 6 ++---
.../models/fieldtypes/TestHashSetCollections.java | 4 ++--
.../TestHashtableStringKeyCollections.java | 4 ++--
.../TestHashtableStringValueCollections.java | 6 ++---
.../fieldtypes/TestLinkedListCollections.java | 4 ++--
.../tck/models/fieldtypes/TestListCollections.java | 2 +-
.../fieldtypes/TestMapStringKeyCollections.java | 4 ++--
.../fieldtypes/TestMapStringValueCollections.java | 6 ++---
.../tck/models/fieldtypes/TestSetCollections.java | 4 ++--
.../TestTreeMapStringKeyCollections.java | 4 ++--
.../TestTreeMapStringValueCollections.java | 6 ++---
.../models/fieldtypes/TestTreeSetCollections.java | 4 ++--
.../models/fieldtypes/TestVectorCollections.java | 2 +-
.../java/org/apache/jdo/tck/pc/order/Order.java | 3 +--
.../org/apache/jdo/tck/util/ClassGenerator.java | 4 ++--
.../org/apache/jdo/tck/util/EqualityHelper.java | 4 ++--
.../jdo/tck/util/signature/SignatureVerifier.java | 2 +-
.../apache/jdo/tck/util/signature/TypeHelper.java | 2 +-
55 files changed, 101 insertions(+), 106 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java b/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
index 8639440a..5956c39d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/SignatureTest.java
@@ -99,7 +99,7 @@ public class SignatureTest extends JDO_Test {
if (status != 0) {
fail(ASSERTION_FAILED,
("Found problems or signature descrepancies." + NEWLINE
- + "Test Output: " + NEWLINE + sw.toString()));
+ + "Test Output: " + NEWLINE + sw));
logger.debug(sw.toString());
}
@@ -110,11 +110,11 @@ public class SignatureTest extends JDO_Test {
} catch (IOException ex) {
fail(ASSERTION_FAILED,
("Exception caught: " + ex + NEWLINE
- + "Test Output: " + NEWLINE + sw.toString()));
+ + "Test Output: " + NEWLINE + sw));
} catch (ParseException ex) {
fail(ASSERTION_FAILED,
("Exception caught: " + ex + NEWLINE
- + "Test Output: " + NEWLINE + sw.toString()));
+ + "Test Output: " + NEWLINE + sw));
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
index 570e7b22..4c605e12 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AbstractInstanceLifecycleListener.java
@@ -463,7 +463,7 @@ public abstract class AbstractInstanceLifecycleListener extends JDO_Test {
}
}
if (messages.length() > 0) {
- fail(where + "\n" + messages.toString());
+ fail(where + "\n" + messages);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
index 1366c09e..c4dc379c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/jdohelper/GetObjectIds.java
@@ -176,8 +176,7 @@ public class GetObjectIds extends JDO_Test {
}
}
if (messages.length() != 0) {
- fail(ASSERTION_FAILED + "getObjectIds(Object[] pcs) " +
- messages.toString());
+ fail(ASSERTION_FAILED + "getObjectIds(Object[] pcs) " + messages);
}
}
@@ -202,8 +201,7 @@ public class GetObjectIds extends JDO_Test {
}
}
if (messages.length() != 0) {
- fail(ASSERTION_FAILED + "getObjectIds(Collection pcs) " +
- messages.toString());
+ fail(ASSERTION_FAILED + "getObjectIds(Collection pcs) " + messages);
}
}
@@ -226,8 +224,7 @@ public class GetObjectIds extends JDO_Test {
}
}
if (messages.length() != 0) {
- fail(ASSERTION_FAILED + "getObjectIds(Object[] pcs) " +
- messages.toString());
+ fail(ASSERTION_FAILED + "getObjectIds(Object[] pcs) " + messages);
}
}
@@ -253,8 +250,7 @@ public class GetObjectIds extends JDO_Test {
}
}
if (messages.length() != 0) {
- fail(ASSERTION_FAILED + "getObjectIds(Collection<SingleFieldIdentyty> pcs) " +
- messages.toString());
+ fail(ASSERTION_FAILED + "getObjectIds(Collection<SingleFieldIdentyty> pcs) " + messages);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
index 0334d852..4f128ab8 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencecapable/NewObjectIdInstance.java
@@ -213,7 +213,7 @@ public class NewObjectIdInstance extends AbstractPersistenceCapableTest {
} catch (JDONullIdentityException e) {
// expected exception
if (debug)
- logger.debug("caught expected exception " + e.toString());
+ logger.debug("caught expected exception " + e);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
index 7ea2b13a..ef1f6fe4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OneInstanceOfObjectPerPersistenceManager.java
@@ -121,7 +121,7 @@ public class OneInstanceOfObjectPerPersistenceManager extends
results.append("query results differ. ");
}
if (results.length() != 0) {
- fail(ASSERTION_FAILED + results.toString());
+ fail(ASSERTION_FAILED + results);
}
// The standard way to end each test method is to simply return. Exceptions are caught by JUnit.
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
index 2119c6e3..55de8e7d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/OptimisticFailure.java
@@ -184,7 +184,7 @@ public class OptimisticFailure extends PersistenceManagerTest {
Throwable t = ts[i];
if (t instanceof JDOOptimisticVerificationException) {
if (debug)
- logger.debug("Expected exception caught " + t.toString());
+ logger.debug("Expected exception caught " + t);
JDOException jex = (JDOException)t;
Object failed = jex.getFailedObject();
if (failed == null) {
@@ -199,7 +199,7 @@ public class OptimisticFailure extends PersistenceManagerTest {
}
else {
fail(ASSERTION_FAILED,
- "Unexpected failed instance: " + failed.toString());
+ "Unexpected failed instance: " + failed);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
index 6c391bc4..3551b9a7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllNoParameterSideEffects.java
@@ -132,12 +132,12 @@ public class RefreshAllNoParameterSideEffects extends PersistenceManagerTest {
} catch (javax.jdo.JDOOptimisticVerificationException ove) {
if (doRefresh) {
appendMessage("Expected no exception on commit with doRefresh "
- + "true, but got " + ove.toString());
+ + "true, but got " + ove);
}
// else expect exception
} catch (Exception e) {
appendMessage("Unexpected exception on commit. doRefresh is "
- + doRefresh + ". Exception is: " + e.toString());
+ + doRefresh + ". Exception is: " + e);
}
// verify that correct value was committed
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
index fe314657..72d6bc8d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/cache/RefreshAllSideEffects.java
@@ -160,12 +160,12 @@ public class RefreshAllSideEffects extends PersistenceManagerTest {
} catch (javax.jdo.JDOOptimisticVerificationException ove) {
if (doRefresh) {
appendMessage("Expected no exception on commit with doRefresh "
- + "true, but got " + ove.toString());
+ + "true, but got " + ove);
}
// else expect exception
} catch (Exception e) {
appendMessage("Unexpected exception on commit. doRefresh is "
- + doRefresh + ". Exception is: " + e.toString());
+ + doRefresh + ". Exception is: " + e);
}
// verify that correct value was committed
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
index b637003c..bfb50ff0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/detach/DetachSerialize.java
@@ -90,7 +90,7 @@ public class DetachSerialize extends DetachTest {
oos.writeObject(root);
return baos.toByteArray();
} catch (Exception ex) {
- fail(ASSERTION_FAILED + "serializing cart:" + ex.toString());
+ fail(ASSERTION_FAILED + "serializing cart:" + ex);
return null; // will not be reached
}
}
@@ -102,7 +102,7 @@ public class DetachSerialize extends DetachTest {
ObjectInputStream ois = new ObjectInputStream(bais);
return ois.readObject();
} catch (Exception ex) {
- fail(ASSERTION_FAILED + "deserializing cart:" + ex.toString());
+ fail(ASSERTION_FAILED + "deserializing cart:" + ex);
return null; // will not be reached
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
index ceaf510c..0828433d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanager/nullargs/PersistenceManagerNullsTest.java
@@ -200,7 +200,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION3_FAILED,
method + " on a null object should do nothing."
- + " Instead we get: " + e.toString());
+ + " Instead we get: " + e);
}
tx.commit();
@@ -238,7 +238,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
fail(ASSERTION4_FAILED,
method
+ " with null Collection argument should throw NPE."
- + " Instead we get: " + e.toString());
+ + " Instead we get: " + e);
e.printStackTrace();
}
tx.commit();
@@ -274,7 +274,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION4_FAILED,
method + " with null array argument should throw NPE."
- + " Instead we get: " + e.toString());
+ + " Instead we get: " + e);
e.printStackTrace();
}
tx.commit();
@@ -307,7 +307,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION5_FAILED,
method + " on a null Collection element should"
- + " do nothing. Instead we get: " + e.toString());
+ + " do nothing. Instead we get: " + e);
e.printStackTrace();
}
@@ -339,7 +339,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION5_FAILED,
method + " on a null array element should "
- + "do nothing. Instead we get: " + e.toString());
+ + "do nothing. Instead we get: " + e);
e.printStackTrace();
}
@@ -372,7 +372,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION3_FAILED,
method + " on a null object should do nothing."
- + " Instead we get: " + e.toString());
+ + " Instead we get: " + e);
e.printStackTrace();
}
if (returnVal != null)
@@ -417,7 +417,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
fail(ASSERTION4_FAILED,
method
+ " with null Collection argument should throw NPE."
- + " Instead we get: " + e.toString());
+ + " Instead we get: " + e);
e.printStackTrace();
}
if (returnVal != null)
@@ -458,7 +458,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION4_FAILED,
method + " with null array argument should throw NPE."
- + " Instead we get: " + e.toString());
+ + " Instead we get: " + e);
e.printStackTrace();
}
if (returnVal != null)
@@ -496,7 +496,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION5_FAILED,
method + " on a null Collection element should"
- + " do nothing. Instead we get: " + e.toString());
+ + " do nothing. Instead we get: " + e);
e.printStackTrace();
}
@@ -504,7 +504,7 @@ public class PersistenceManagerNullsTest extends JDO_Test {
fail(ASSERTION5_FAILED,
method + " returns incorrect Object. Expected "
+ expectedCollection.toString() + " actual was "
- + returnVal.toString());
+ + returnVal);
tx.commit();
} finally {
if (tx.isActive())
@@ -534,16 +534,16 @@ public class PersistenceManagerNullsTest extends JDO_Test {
} catch (Exception e) {
fail(ASSERTION5_FAILED,
method + " on a null array element should "
- + "do nothing. Instead we get: " + e.toString());
+ + "do nothing. Instead we get: " + e);
e.printStackTrace();
}
if (!checkReturn(expectedArray, returnVal))
fail(ASSERTION5_FAILED,
method + " returns incorrect Object. Expected "
- + Arrays.asList(expectedArray).toString()
+ + Arrays.asList(expectedArray)
+ " actual was "
- + Arrays.asList(returnVal).toString());
+ + Arrays.asList(returnVal));
tx.commit();
} finally {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
index 76d4cb60..cd1697a4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AbstractGetPMF.java
@@ -119,7 +119,7 @@ abstract class AbstractGetPMF extends JDO_Test {
} catch (JDOFatalUserException e) {
// expected exception
if (debug)
- logger.debug("caught expected exception " + e.toString());
+ logger.debug("caught expected exception " + e);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java
index 8c2e9839..5a6d3d98 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseGetPMThrowsException.java
@@ -69,7 +69,7 @@ public class AfterCloseGetPMThrowsException extends JDO_Test {
} catch (JDOUserException ex) {
// expected exception
if (debug)
- logger.debug("caught expected exception " + ex.toString());
+ logger.debug("caught expected exception " + ex);
} catch (JDOFatalUserException ex) {
// unexpected exception
fail(ASSERTION_FAILED,
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
index 9e7602d5..35cde34c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterCloseSetMethodsThrowException.java
@@ -144,11 +144,11 @@ public class AfterCloseSetMethodsThrowException extends JDO_Test {
"pmf method " + where + " should throw JDOUserException when called for closed pmf");
} catch (JDOUserException ex) {
if (debug)
- logger.debug("Caught expected exception " + ex.toString() +
+ logger.debug("Caught expected exception " + ex +
" from " + where);
} catch (Exception ex) {
fail(ASSERTION_FAILED,
- "Caught unexpected exception " + ex.toString() + " from " + where);
+ "Caught unexpected exception " + ex + " from " + where);
}
}
// each get method should succeed
@@ -160,7 +160,7 @@ public class AfterCloseSetMethodsThrowException extends JDO_Test {
gp.execute(pmf);
} catch (Exception ex) {
fail(ASSERTION_FAILED,
- "Caught unexpected exception " + ex.toString() + " from " +
+ "Caught unexpected exception " + ex + " from " +
where);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
index 4d349024..c3aa7e3b 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/AfterGetPersistenceManagerNoSetMethodsSucceed.java
@@ -151,7 +151,7 @@ public class AfterGetPersistenceManagerNoSetMethodsSucceed extends JDO_Test {
" should throw JDOUserException when called after getPersistenceManager");
} catch (JDOUserException ex) {
if (debug)
- logger.debug("Caught expected exception " + ex.toString() + " from " + where);
+ logger.debug("Caught expected exception " + ex + " from " + where);
}
}
// each get method should succeed
@@ -163,7 +163,7 @@ public class AfterGetPersistenceManagerNoSetMethodsSucceed extends JDO_Test {
gp.execute(pmf);
} catch (JDOUserException ex) {
fail(ASSERTION_FAILED,
- "Caught unexpected exception " + ex.toString() + " from " + where);
+ "Caught unexpected exception " + ex + " from " + where);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java
index 8f9b76a1..ef952fb1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/Close.java
@@ -123,7 +123,7 @@ public class Close extends JDO_Test {
} catch (JDOUserException ex) {
// expected exception
if (debug) {
- logger.debug("caught expected exception " + ex.toString());
+ logger.debug("caught expected exception " + ex);
}
} catch (JDOFatalUserException ex) {
// unexpected exception
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java
index 5d1d2fc0..ac1ea987 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseFailsIfTransactionActive.java
@@ -102,7 +102,7 @@ public class CloseFailsIfTransactionActive extends JDO_Test {
if (pm2.equals(failed)) {
if (debug)
logger.debug("Found expected failed object " +
- failed.toString());
+ failed);
}
else {
setAborted();
@@ -121,13 +121,13 @@ public class CloseFailsIfTransactionActive extends JDO_Test {
catch (Exception uex) {
setAborted();
fail(ASSERTION_FAILED,
- "Caught 1 unexpected exception " + uex.toString());
+ "Caught 1 unexpected exception " + uex);
}
}
catch (Exception ex) {
setAborted();
fail(ASSERTION_FAILED,
- "Caught 2 unexpected exception " + ex.toString());
+ "Caught 2 unexpected exception " + ex);
}
if (!isAborted()) {
@@ -145,7 +145,7 @@ public class CloseFailsIfTransactionActive extends JDO_Test {
}
catch (Exception ex) {
fail(ASSERTION_FAILED,
- "Caught 3 unexpected exception " + ex.toString());
+ "Caught 3 unexpected exception " + ex);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java
index 1df9a0d0..ccb9733f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/CloseWithoutPermissionThrowsSecurityException.java
@@ -88,7 +88,7 @@ public class CloseWithoutPermissionThrowsSecurityException extends JDO_Test {
} catch (SecurityException ex) {
// expected exception if JDOPermission("closePersistenceManagerFactory") is not set
if (debug)
- logger.debug("caught expected exception " + ex.toString());
+ logger.debug("caught expected exception " + ex);
} catch (JDOException e) {
fail(ASSERTION_FAILED, "Unexpected exception at pmf.close(): " + e);
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java
index ae401b27..6bc90a27 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/persistencemanagerfactory/metadata/GetMetadataTest.java
@@ -123,7 +123,7 @@ public class GetMetadataTest extends JDO_Test {
buffer.append("ColumnMetadata for " + columnMetadata.getName());
}
}
- System.out.println(buffer.toString());
+ System.out.println(buffer);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java
index 300a8c50..d89d8916 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/ObjectIdNotModifiedWhenObjectIdInstanceModified.java
@@ -103,7 +103,7 @@ public class ObjectIdNotModifiedWhenObjectIdInstanceModified extends JDO_Test {
report.append(before);
report.append("\n");
report.append("mangled= ");
- report.append(objId2.toString());
+ report.append(objId2);
report.append("\n");
report.append(" after= ");
report.append(objId3.toString());
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
index 6a55da34..7af31717 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayCollections.java
@@ -198,7 +198,7 @@ public class TestArrayCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
index ba35563f..6cc299ab 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestArrayListCollections.java
@@ -138,7 +138,7 @@ public class TestArrayListCollections extends JDO_Test {
ArrayList<?> arrayListValue = new ArrayList<>(value);
collect.set(i, arrayListValue);
if (debug)
- logger.debug("Set " + i + "th value to: " + value.toString());
+ logger.debug("Set " + i + "th value to: " + value);
}
}
@@ -194,7 +194,7 @@ public class TestArrayListCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
index c560b61e..7b842002 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestCollectionCollections.java
@@ -179,7 +179,7 @@ public class TestCollectionCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
index 6ae6500e..09d2d4f2 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigDecimal.java
@@ -127,7 +127,7 @@ public class TestFieldsOfBigDecimal extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfBigDecimal.fieldSpecs[i] +
", expected value " + value.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
index 5014f56f..4d9f2bb4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBigInteger.java
@@ -128,7 +128,7 @@ public class TestFieldsOfBigInteger extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfBigInteger.fieldSpecs[i] +
", expected value " + value.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java
index 67cb8672..52c1440e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfBoolean.java
@@ -125,7 +125,7 @@ public class TestFieldsOfBoolean extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfBoolean.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
index 7d78f9de..c24ac4a5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfByte.java
@@ -126,7 +126,7 @@ public class TestFieldsOfByte extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfByte.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
index fb3b62a9..93b5c478 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfCharacter.java
@@ -126,7 +126,7 @@ public class TestFieldsOfCharacter extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfCharacter.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java
index 8abb4460..9d67dba9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDate.java
@@ -126,7 +126,7 @@ public class TestFieldsOfDate extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfDate.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java
index a584a611..abbf2a40 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfDouble.java
@@ -125,7 +125,7 @@ public class TestFieldsOfDouble extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfDouble.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
index b212fec4..a19fb894 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfFloat.java
@@ -126,7 +126,7 @@ public class TestFieldsOfFloat extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfFloat.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java
index fbce0e00..79596fc5 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfInteger.java
@@ -124,7 +124,7 @@ public class TestFieldsOfInteger extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfInteger.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java
index de3a72c3..064bd6e4 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLocale.java
@@ -127,7 +127,7 @@ public class TestFieldsOfLocale extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfLocale.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java
index 193a34f7..e3f4c174 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfLong.java
@@ -125,7 +125,7 @@ public class TestFieldsOfLong extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfLong.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java
index 9415c4d2..3dda989f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfObject.java
@@ -138,7 +138,7 @@ public class TestFieldsOfObject extends JDO_Test {
buffer.append(" has wrong value: expected ");
buffer.append(startValue.toString());
buffer.append(" actual ");
- buffer.append(val.toString());
+ buffer.append(val);
buffer.append(".\n");
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java
index cc3acfa1..99168969 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfShort.java
@@ -126,7 +126,7 @@ public class TestFieldsOfShort extends JDO_Test {
fail(ASSERTION_FAILED,
"Incorrect value for " + FieldsOfShort.fieldSpecs[i] +
", expected value " + startValue.toString() +
- ", value is " + val.toString());
+ ", value is " + val);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java
index f64557f3..e5fcf581 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestFieldsOfSimpleEnum.java
@@ -123,7 +123,7 @@ public class TestFieldsOfSimpleEnum extends JDO_Test {
if(!startValue.equals(val) ){
appendMessage(ASSERTION_FAILED +
"Incorrect value for " + FieldsOfSimpleEnum.fieldSpecs[i] +
- ", expected value " + startValue.toString() +
+ ", expected value " + startValue +
", value is " + val);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
index ef82ac8b..3a4a846a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringKeyCollections.java
@@ -147,7 +147,7 @@ public class TestHashMapStringKeyCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -195,7 +195,7 @@ public class TestHashMapStringKeyCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
index 5287851e..a2e47f75 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashMapStringValueCollections.java
@@ -148,7 +148,7 @@ public class TestHashMapStringValueCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -182,7 +182,7 @@ public class TestHashMapStringValueCollections extends JDO_Test {
sbuf.append("\nFor element " + i +
" expected key = " + expectedKey +
" not found in actual Map. Actual keyset is "
- + actualKeySet.toString());
+ + actualKeySet);
// compare values
} else {
String expectedVal = (String) expected.get(expectedKey);
@@ -205,7 +205,7 @@ public class TestHashMapStringValueCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
index e15f0b3c..ab1ba1c7 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashSetCollections.java
@@ -134,7 +134,7 @@ public class TestHashSetCollections extends JDO_Test {
HashSet<?> lvalue = new HashSet<>(value);
collect.set(i, lvalue);
if (debug)
- logger.debug("Set " + i + "th value to: " + value.toString());
+ logger.debug("Set " + i + "th value to: " + value);
}
}
@@ -184,7 +184,7 @@ public class TestHashSetCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
index c5fc7ec8..99d82e18 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringKeyCollections.java
@@ -149,7 +149,7 @@ public class TestHashtableStringKeyCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -197,7 +197,7 @@ public class TestHashtableStringKeyCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
index d697df20..9f289f75 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestHashtableStringValueCollections.java
@@ -147,7 +147,7 @@ public class TestHashtableStringValueCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -181,7 +181,7 @@ public class TestHashtableStringValueCollections extends JDO_Test {
sbuf.append("\nFor element " + i +
" expected key = " + expectedKey +
" not found in actual Map. Actual keyset is "
- + actualKeySet.toString());
+ + actualKeySet);
// compare values
} else {
String expectedVal = (String) expected.get(expectedKey);
@@ -204,7 +204,7 @@ public class TestHashtableStringValueCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
index 1b0b2a84..68986c3d 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestLinkedListCollections.java
@@ -140,7 +140,7 @@ public class TestLinkedListCollections extends JDO_Test {
LinkedList<?> lvalue = new LinkedList<>(value);
collect.set(i, lvalue);
if (debug)
- logger.debug("Set " + i + "th value to: " + value.toString());
+ logger.debug("Set " + i + "th value to: " + value);
}
}
@@ -186,7 +186,7 @@ public class TestLinkedListCollections extends JDO_Test {
} }
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
index 0f9e2d08..fa7a34b6 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestListCollections.java
@@ -191,7 +191,7 @@ public class TestListCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
index 039f1d10..8363ed0a 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringKeyCollections.java
@@ -149,7 +149,7 @@ public class TestMapStringKeyCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -197,7 +197,7 @@ public class TestMapStringKeyCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
index f171a84e..778ffffe 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestMapStringValueCollections.java
@@ -152,7 +152,7 @@ public class TestMapStringValueCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -186,7 +186,7 @@ public class TestMapStringValueCollections extends JDO_Test {
sbuf.append("\nFor element " + i +
" expected key = " + expectedKey +
" not found in actual Map. Actual keyset is "
- + actualKeySet.toString());
+ + actualKeySet);
// compare values
} else {
String expectedVal = (String) expected.get(expectedKey);
@@ -209,7 +209,7 @@ public class TestMapStringValueCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
index 1ff31b50..8fd6f56c 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestSetCollections.java
@@ -132,7 +132,7 @@ public class TestSetCollections extends JDO_Test {
Set<?> lvalue = new HashSet<>(value);
collect.set(i, lvalue);
if (debug)
- logger.debug("Set " + i + "th value to: " + value.toString());
+ logger.debug("Set " + i + "th value to: " + value);
}
}
@@ -182,7 +182,7 @@ public class TestSetCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
index 84f48f64..e03d56b0 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringKeyCollections.java
@@ -146,7 +146,7 @@ public class TestTreeMapStringKeyCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -194,7 +194,7 @@ public class TestTreeMapStringKeyCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
index a4388256..5853eb22 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeMapStringValueCollections.java
@@ -145,7 +145,7 @@ public class TestTreeMapStringValueCollections extends JDO_Test {
}
collect.set(i, map);
if (debug)
- logger.debug("Set " + i + "th value to: " + map.toString());
+ logger.debug("Set " + i + "th value to: " + map);
}
}
@@ -179,7 +179,7 @@ public class TestTreeMapStringValueCollections extends JDO_Test {
sbuf.append("\nFor element " + i +
" expected key = " + expectedKey +
" not found in actual Map. Actual keyset is "
- + actualKeySet.toString());
+ + actualKeySet);
// compare values
} else {
String expectedVal = (String) expected.get(expectedKey);
@@ -202,7 +202,7 @@ public class TestTreeMapStringValueCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java
index 48ddb650..b5fef6e3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestTreeSetCollections.java
@@ -140,7 +140,7 @@ public class TestTreeSetCollections extends JDO_Test {
TreeSet<?> treeSet = new TreeSet<>((Collection<?>)value);
collect.set(i, treeSet);
if (debug)
- logger.debug("Set " + i + "th value to: " + treeSet.toString());
+ logger.debug("Set " + i + "th value to: " + treeSet);
}
}
@@ -167,7 +167,7 @@ public class TestTreeSetCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
index b0253cca..fb85decd 100644
--- a/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
+++ b/tck/src/main/java/org/apache/jdo/tck/models/fieldtypes/TestVectorCollections.java
@@ -184,7 +184,7 @@ public class TestVectorCollections extends JDO_Test {
}
if (sbuf.length() > 0) {
fail(ASSERTION_FAILED,
- "Expected and observed do not match!!" + sbuf.toString());
+ "Expected and observed do not match!!" + sbuf);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java b/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java
index 9f313564..c5ef2c30 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/order/Order.java
@@ -144,8 +144,7 @@ public class Order implements Serializable, Comparable<Order>, Comparator<Order>
}
public String toString() {
- return this.getClass().getName() + "order:"
- + String.valueOf(orderId);
+ return this.getClass().getName() + "order:" + orderId;
}
/** */
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/ClassGenerator.java b/tck/src/main/java/org/apache/jdo/tck/util/ClassGenerator.java
index d1f8fcd6..44e47df9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/ClassGenerator.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/ClassGenerator.java
@@ -155,13 +155,13 @@ if(!(xmlEmbeddedModifiers[m].equals("") && xmlPersistenceModifiers[l].equals(""
buildisStaticArray(isStatic(fieldModifiers[k])); // add to isStaticArray
buildFieldSpecs(xmlPersistenceModifiers[l].replace('"',' ') + " " +
xmlEmbeddedModifiers[m].replace('"',' ') +
- sb.toString()); // add to the field specs array
+ sb); // add to the field specs array
isFinal[fieldCounter-1] = fieldModifiers[k].indexOf("final") >= 0;
if(isFinal[fieldCounter-1])
sb.append(getInitializerForFinalTypes(fieldTypes[i]));
buildisFinalArray(isFinal[fieldCounter-1]);
sb.append(";");
- pw.println(sb.toString());
+ pw.println(sb);
}
}
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java b/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java
index 70747111..59fbb749 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/EqualityHelper.java
@@ -361,11 +361,11 @@ public class EqualityHelper {
offset.append(" ");
}
unequalBuffer.append(where);
- unequalBuffer.append(offset.toString());
+ unequalBuffer.append(offset);
unequalBuffer.append("expected '");
unequalBuffer.append(o1);
unequalBuffer.append("'");
- unequalBuffer.append(offset.toString());
+ unequalBuffer.append(offset);
unequalBuffer.append(" actual '");
unequalBuffer.append(o2);
unequalBuffer.append("'\n");
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java b/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java
index 0a44f477..59cd59a1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/signature/SignatureVerifier.java
@@ -451,7 +451,7 @@ public class SignatureVerifier {
} else {
s = "";
}
- ok = (String.valueOf(s)).equals(actual);
+ ok = s.equals(actual);
}
// now check non-java.lang annotations and enums
} else {
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/signature/TypeHelper.java b/tck/src/main/java/org/apache/jdo/tck/util/signature/TypeHelper.java
index 3b901c36..b444ff54 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/signature/TypeHelper.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/signature/TypeHelper.java
@@ -112,7 +112,7 @@ public class TypeHelper {
s = userTypeNames.get(name.substring(i));
check(s != null, MSG_ILLEGAL_RFL_TYPE + name);
}
- return (s + sb.toString());
+ return (s + sb);
}
/**