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/17 19:10:53 UTC
[db-jdo] 06/08: JDO-817 removing compiler warnings: identical catch branches in try
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 a741b34686730847006044d2ba931b2e3f4bb198
Author: Michael Bouschen <Mi...@akquinet.de>
AuthorDate: Sun Jul 17 20:19:27 2022 +0200
JDO-817 removing compiler warnings: identical catch branches in try
---
tck/src/main/java/org/apache/jdo/tck/JDO_Test.java | 11 ++-------
.../java/org/apache/jdo/tck/api/SignatureTest.java | 6 +----
.../AccessingFieldsInPredelete.java | 18 +++++----------
.../api/instancecallbacks/CallingJdoPostload.java | 8 ++-----
.../api/instancecallbacks/CallingJdoPrestore.java | 26 +++++-----------------
...ationOfNontransactionalNonpersistentFields.java | 8 ++-----
.../NoAccessToFieldsAfterPredelete.java | 7 ++----
.../tck/api/persistencemanagerfactory/Close.java | 12 ++--------
.../lifecycle/StateTransitionsReturnedObjects.java | 4 +---
.../org/apache/jdo/tck/util/ResultSummary.java | 6 +----
.../jdo/tck/util/signature/SignatureVerifier.java | 14 ++----------
11 files changed, 26 insertions(+), 94 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
index 6d56b8e7..2155543e 100644
--- a/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
+++ b/tck/src/main/java/org/apache/jdo/tck/JDO_Test.java
@@ -278,18 +278,11 @@ public abstract class JDO_Test extends TestCase {
setUp();
runTest();
testSucceeded = true;
- }
- catch (AssertionFailedError e) {
+ } catch (Throwable e) {
if (logger.isInfoEnabled())
logger.info("Exception during setUp or runtest: ", e);
throw e;
- }
- catch (Throwable t) {
- if (logger.isInfoEnabled())
- logger.info("Exception during setUp or runtest: ", t);
- throw t;
- }
- finally {
+ } finally {
tearDown();
if (debug) {
logger.debug("Free memory: " + Runtime.getRuntime().freeMemory());
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 5956c39d..1e6e8024 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
@@ -107,11 +107,7 @@ public class SignatureTest extends JDO_Test {
if (debug) {
logger.debug(sw.toString());
}
- } catch (IOException ex) {
- fail(ASSERTION_FAILED,
- ("Exception caught: " + ex + NEWLINE
- + "Test Output: " + NEWLINE + sw));
- } catch (ParseException ex) {
+ } catch (IOException | ParseException ex) {
fail(ASSERTION_FAILED,
("Exception caught: " + ex + NEWLINE
+ "Test Output: " + NEWLINE + sw));
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
index c1b00795..af8ea210 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/AccessingFieldsInPredelete.java
@@ -114,12 +114,10 @@ public class AccessingFieldsInPredelete extends TestParts {
try {
primaryObj = (InstanceCallbackClass)pm.getObjectById(primaryObjId, true);
fail(ASSERTION_FAILED, "primaryObj deleted but getObjectById() on its Id succeeded.");
- } catch (JDOUserException e) {
- // expected one of these exceptions
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// expected one of these exceptions
}
-
+
// check that jdoPreDelete() provided proper access to the attributes in primaryObj
checkFieldValues(ASSERTION_FAILED, "jdoPreDelete attribute access: ", 1, "primaryObj", createTime, 1.0, (short)3, '1');
checkInstances(ASSERTION_FAILED, "jdoPreDelete instance access: ", 1, "secondaryObj", 2, 7);
@@ -134,12 +132,10 @@ public class AccessingFieldsInPredelete extends TestParts {
try {
secondaryObj = (InstanceCallbackClass)pm.getObjectById(secondaryObjId, true);
fail(ASSERTION_FAILED, "secondaryObj should have been deleted but getObjectById() on its Id succeeded.");
- } catch (JDOUserException e) {
- // expected one of these exceptions
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// expected one of these exceptions
}
-
+
// check that first added member of Set had jdoPreDelete() called on it and provided proper access to its attributes.
checkFieldValues(ASSERTION_FAILED, "jdoPreDelete attribute access: ", 3, "childA", createTime, 3.0, (short)-2, '3');
checkInstances(ASSERTION_FAILED, "jdoPreDelete instance access: ", 3, null, 0, 0);
@@ -149,12 +145,10 @@ public class AccessingFieldsInPredelete extends TestParts {
try {
childA = (InstanceCallbackClass)pm.getObjectById(childAId, true);
fail(ASSERTION_FAILED, "First added member of Set primaryObj.children should have been deleted but getObjectById() on its Id succeeded.");
- } catch (JDOUserException e) {
- // expected one of these exceptions
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// expected one of these exceptions
}
-
+
// check that the second added member of Set did not have jdoPreDelete() called on it and it was not deleted.
if(InstanceCallbackClass.processedIndex[4] == true) {
fail(ASSERTION_FAILED, "jdoPreDelete() called on childB--it was not deleted.");
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
index 0aa115fd..57dc9dd1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPostload.java
@@ -98,16 +98,12 @@ public class CallingJdoPostload extends JDO_Test {
InstanceCallbackNonPersistFdsClass.applicationStep = InstanceCallbackNonPersistFdsClass.beforeGetObjectById;
try {
obj1 = (InstanceCallbackNonPersistFdsClass)pm.getObjectById(objPtr1, true); // jdoPreLoad() called
- } catch (JDOUserException e) {
- // could not locate persistent object created in previous transaction
- fail(ASSERTION_FAILED, "CallingJdoPostload: Could not locate persistent object obj1 created in previous transaction " + e);
- return;
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// could not locate persistent object created in previous transaction
fail(ASSERTION_FAILED, "CallingJdoPostload: Could not locate persistent object obj1 created in previous transaction " + e);
return;
}
-
+
int objectState = currentState(obj1);
// expect state to be hollow or persistent-clean
if(objectState != HOLLOW && objectState != PERSISTENT_CLEAN) {
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
index c2dc2609..88773911 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/CallingJdoPrestore.java
@@ -126,11 +126,7 @@ public class CallingJdoPrestore extends JDO_Test {
obj1.setNonManaged(-1, (char)62);
expectedIntValue1 = obj1.calcIntValue();
expectedFloatValue1 = obj1.calcFloatValue();
- } catch (JDOUserException e) {
- // could not locate persistent object created in previous transaction
- fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj1 created in previous transaction, got " + e);
- return;
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// could not locate persistent object created in previous transaction
fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj1 created in previous transaction, got " + e);
return;
@@ -148,11 +144,7 @@ public class CallingJdoPrestore extends JDO_Test {
// change obj2 making it persistent dirty (leave obj1 persistent clean).
obj2.incrementIntValue();
- } catch (JDOUserException e) {
- // could not locate persistent object created in previous transaction
- fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj2 created in previous transaction, got " + e);
- return;
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// could not locate persistent object created in previous transaction
fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj2 created in previous transaction, got " + e);
return;
@@ -167,25 +159,17 @@ public class CallingJdoPrestore extends JDO_Test {
obj1 = (InstanceCallbackNonPersistFdsClass)pm.getObjectById(objPtr1, true);
checkValues("Object1, did not expect jdoPreStore to be called: ", origIntValue1, origIntValue1, obj1.intValue);
checkValues("Object1, did not expect jdoPreStore to be called: ", origFloatValue1, origFloatValue1, obj1.floatValue);
- } catch (JDOUserException e) {
- // could not locate persistent object created in previous transaction
- fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj1 created in previous transaction, got " + e);
- return;
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// could not locate persistent object created in previous transaction
fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj1 created in previous transaction, got " + e);
return;
}
-
+
try {
obj2 = (InstanceCallbackNonPersistFdsClass)pm.getObjectById(objPtr2, true);
checkValues("Object2, expected jdoPreStore() to be called: ", origIntValue2, expectedIntValue2, obj2.intValue);
checkValues("Object2, expected jdoPreStore() to be called: ", origFloatValue2, expectedFloatValue2, obj2.floatValue);
- } catch (JDOUserException e) {
- // could not locate persistent object created in previous transaction
- fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj2 created in previous transaction, got " + e);
- return;
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// could not locate persistent object created in previous transaction
fail(ASSERTION_FAILED, "CallingJdoPrestore: Failed to find object obj2 created in previous transaction, got " + e);
return;
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
index 1a4202d6..2da1bd6f 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/ModificationOfNontransactionalNonpersistentFields.java
@@ -90,16 +90,12 @@ public class ModificationOfNontransactionalNonpersistentFields extends JDO_Test
t.begin();
try {
obj1 = (InstanceCallbackNonPersistFdsClass)pm.getObjectById(objPtr1, true); // jdoPostLoad() called
- } catch (JDOUserException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
// could not locate persistent object created in previous transaction
fail(ASSERTION_FAILED, "ModificationOfNontransactionalNonpersistentFields: Could not locate persistent object obj1 created in previous transaction, got " + e);
return;
- } catch (JDODataStoreException e) {
- // could not locate persistent object created in previous transaction
- fail(ASSERTION_FAILED, "ModificationOfNontransactionalNonpersistentFields: Could not locate persistent object obj1 created in previous transaction, got " + e);
- return;
}
-
+
// check fields set in jdoPostLoad()
if(obj1.i != -10) {
fail(ASSERTION_FAILED, "jdoPostLoad: Value incorrect, obj1.i != -10; it is " + obj1.i);
diff --git a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
index 1a00ff78..359e42d9 100644
--- a/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
+++ b/tck/src/main/java/org/apache/jdo/tck/api/instancecallbacks/NoAccessToFieldsAfterPredelete.java
@@ -89,14 +89,11 @@ public class NoAccessToFieldsAfterPredelete extends JDO_Test {
// relocte object.
try {
a = (InstanceCallbackClass)pm.getObjectById(aId, true);
- } catch (JDOUserException e) {
- fail(ASSERTION_FAILED, "NoAccessToFieldsAfterPredelete: Could not locate persistent object created in previous transaction, got " + e);
- return;
- } catch (JDODataStoreException e) {
+ } catch (JDOUserException | JDODataStoreException e) {
fail(ASSERTION_FAILED, "NoAccessToFieldsAfterPredelete: Could not locate persistent object created in previous transaction, got " + e);
return;
}
-
+
pm.deletePersistent(a);
performAccessFieldTests("Object in state persistent-deleted: ", a);
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 ef952fb1..5f2c552f 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
@@ -86,11 +86,7 @@ public class Close extends JDO_Test {
fail(ASSERTION_FAILED,
"PMF.isClosed() returned false on a closed pmf");
}
- } catch (JDOUserException ex) {
- // unexpected exception
- fail(ASSERTION_FAILED,
- "Unexpected exception at pmf.close()/isClosed(): " + ex);
- } catch (JDOFatalUserException ex) {
+ } catch (JDOUserException | JDOFatalUserException ex) {
// unexpected exception
fail(ASSERTION_FAILED,
"Unexpected exception at pmf.close()/isClosed(): " + ex);
@@ -105,11 +101,7 @@ public class Close extends JDO_Test {
return null;
}
);
- } catch (JDOUserException ex) {
- // unexpected exception
- fail(ASSERTION_FAILED,
- "Unexpected exception at repeated pmf.close(): " + ex);
- } catch (JDOFatalUserException ex) {
+ } catch (JDOUserException | JDOFatalUserException ex) {
// unexpected exception
fail(ASSERTION_FAILED,
"Unexpected exception at repeated pmf.close(): " + ex);
diff --git a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
index 5bdcc2c0..246fbac3 100644
--- a/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
+++ b/tck/src/main/java/org/apache/jdo/tck/lifecycle/StateTransitionsReturnedObjects.java
@@ -422,9 +422,7 @@ public class StateTransitionsReturnedObjects extends JDO_Test {
ois = new ObjectInputStream(new ByteArrayInputStream(
byteArrayOutputStream.toByteArray()));
result = ois.readObject();
- } catch (IOException e) {
- throw new JDOFatalException(e.getMessage(), e);
- } catch (ClassNotFoundException e) {
+ } catch (IOException | ClassNotFoundException e) {
throw new JDOFatalException(e.getMessage(), e);
} finally {
try {
diff --git a/tck/src/main/java/org/apache/jdo/tck/util/ResultSummary.java b/tck/src/main/java/org/apache/jdo/tck/util/ResultSummary.java
index 2d9e9b72..60357c53 100644
--- a/tck/src/main/java/org/apache/jdo/tck/util/ResultSummary.java
+++ b/tck/src/main/java/org/apache/jdo/tck/util/ResultSummary.java
@@ -141,11 +141,7 @@ public class ResultSummary implements Serializable {
}
} catch (FileNotFoundException e) {
result = null;
- } catch (IOException e) {
- throw new JDOFatalException(
- "Cannot deserialize result summary in file "
- +fileName, e);
- } catch (ClassNotFoundException e) {
+ } catch (IOException | ClassNotFoundException e) {
throw new JDOFatalException(
"Cannot deserialize result summary in file "
+fileName, e);
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 f09d9fdb..e71bca5e 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
@@ -348,10 +348,8 @@ public class SignatureVerifier {
final String r = TypeHelper.reflectionTypeName(userTypeName);
cls = Class.forName(r, false, classLoader);
loading.add(userTypeName);
- } catch (LinkageError err) {
+ } catch (LinkageError | ClassNotFoundException err) {
handleNotLoading(err);
- } catch (ClassNotFoundException ex) {
- handleNotLoading(ex);
}
return cls;
}
@@ -487,15 +485,7 @@ public class SignatureVerifier {
Field expectedField =
expectedClass.getField(expectedFieldName);
expectedValue = expectedField.get(null);
- } catch (NoSuchFieldException ex) {
- handleNotLoading(ex);
- } catch (SecurityException ex) {
- handleNotLoading(ex);
- } catch (IllegalArgumentException ex) {
- handleNotLoading(ex);
- } catch (IllegalAccessException ex) {
- handleNotLoading(ex);
- } catch (ClassNotFoundException ex) {
+ } catch (NoSuchFieldException | ClassNotFoundException | IllegalAccessException | IllegalArgumentException | SecurityException ex) {
handleNotLoading(ex);
}
ok = expectedValue.equals(actual);