Allon Mureinik has uploaded a new change for review.
Change subject: core: Consolidate duplicate exception handling
......................................................................
core: Consolidate duplicate exception handling
This patch removes duplicate blocks of exception handling.
The pattern this patch addresses is the following:
try {
someFunction();
} catch (SomeException e) {
handleException(e);
} catch (SomeBaseException e) {
handleException(e);
}
If SomeException inherits from SomeBaseException, this construct is
completely redundant (regardless of Java version), and should be
simplified to just handle SomeBaseException:
try {
someFunction();
} catch (SomeBaseException e) {
handleException(e);
}
If SomeException does not inherit from SomeBaseException, this
construct is still difficult to read, and could be simplified using
Java 7 syntax:
try {
someFunction();
} catch (SomeBaseException | SomeException e) {
handleException(e);
}
Change-Id: I37e468c40a9542e833b3e342fab023a7cde8ffe6
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/BaseProviderProxy.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ImportProviderCertificateChainCommand.java
M
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializer.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializer.java
M
backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
M
backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java
13 files changed, 12 insertions(+), 69 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/18871/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
index c15a88d..71e1bd9 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/FenceVdsBaseCommand.java
@@ -294,9 +294,7 @@
} else {
tryOtherConcurrentAgent(lastStatus, ecs);
}
- } catch (InterruptedException e) {
- tryOtherConcurrentAgent(lastStatus, ecs);
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
tryOtherConcurrentAgent(lastStatus, ecs);
}
@@ -325,9 +323,7 @@
setFenceSucceeded(true);
break;
}
- } catch (InterruptedException e) {
- log.error(e);
- } catch (ExecutionException e) {
+ } catch (InterruptedException | ExecutionException e) {
log.error(e);
}
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
index 738b2cb..fbf1eaa 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/host/provider/foreman/ForemanHostProviderProxy.java
@@ -28,8 +28,6 @@
import org.ovirt.engine.core.common.errors.VdcBLLException;
import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.utils.ssl.AuthSSLProtocolSocketFactory;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.DeserializationConfig.Feature;
@@ -64,10 +62,6 @@
runHttpMethod(httpClient, httpMethod);
ForemanHostWrapper[] hosts =
objectMapper.readValue(httpMethod.getResponseBody(),
ForemanHostWrapper[].class);
return map(Arrays.asList(hosts));
- } catch (JsonParseException e) {
- handleException(e);
- } catch (JsonMappingException e) {
- handleException(e);
} catch (IOException e) {
handleException(e);
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/BaseProviderProxy.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/BaseProviderProxy.java
index e158163..6f69a00 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/BaseProviderProxy.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/BaseProviderProxy.java
@@ -56,14 +56,9 @@
return chain;
} catch (SSLHandshakeException e) {
return chain;
- } catch (NoSuchAlgorithmException e) {
+ } catch (NoSuchAlgorithmException | IOException |
KeyManagementException e) {
handleException(e);
- } catch (KeyManagementException e) {
- handleException(e);
- } catch (IOException e) {
- handleException(e);
- }
- finally {
+ } finally {
if (conn != null) {
conn.disconnect();
}
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ImportProviderCertificateChainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ImportProviderCertificateChainCommand.java
index 8a912e1..80a99b1 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ImportProviderCertificateChainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/provider/ImportProviderCertificateChainCommand.java
@@ -1,7 +1,6 @@
package org.ovirt.engine.core.bll.provider;
import java.security.KeyStore;
-import java.security.KeyStoreException;
import java.security.cert.Certificate;
import java.util.Collections;
import java.util.List;
@@ -77,8 +76,6 @@
ExternalTrustStoreInitializer.setTrustStore(ks);
setSucceeded(true);
- } catch (KeyStoreException e) {
- handleException(e);
} catch (Throwable e) {
handleException(e);
}
diff --git
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
index 4f82d9c..8ffc94f 100644
---
a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
+++
b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/AbstractBackendCollectionResource.java
@@ -173,7 +173,7 @@
method = entityResource.getClass().getMethod("get");
method.invoke(entityResource);
}
- } catch (IllegalAccessException e) {
+ } catch (IllegalAccessException | SecurityException |
NoSuchMethodException e) {
LOG.error("Reflection Error", e);
} catch (InvocationTargetException e) {
if (e.getTargetException() instanceof WebApplicationException) {
@@ -181,10 +181,6 @@
} else {
LOG.error("Reflection Error", e);
}
- } catch (SecurityException e) {
- LOG.error("Reflection Error", e);
- } catch (NoSuchMethodException e) {
- LOG.error("Reflection Error", e);
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
index ee73c46..a7273fc 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/collections/CopyOnAccessMap.java
@@ -106,13 +106,9 @@
};
return (O) objectIn.readObject();
}
- catch (IOException exception) {
+ catch (IOException | ClassNotFoundException exception) {
throw new RuntimeException(exception);
- }
- catch (ClassNotFoundException exception) {
- throw new RuntimeException(exception);
- }
- finally {
+ } finally {
if (objectIn != null) {
try {
objectIn.close();
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java
index 14a9a44..2209584 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/hostinstall/OpenSslCAWrapper.java
@@ -162,9 +162,7 @@
exitCode = process.exitValue();
completed = true;
break;
- } catch (IllegalThreadStateException e) {
- // keep going
- } catch (InterruptedException ie) {
+ } catch (IllegalThreadStateException | InterruptedException e)
{
// keep going
}
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializer.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializer.java
index e34d7fc..867a99d 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializer.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectDeserializer.java
@@ -5,9 +5,7 @@
import org.apache.commons.lang.SerializationException;
import org.apache.commons.lang.StringUtils;
-import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.DeserializationConfig.Feature;
-import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.ovirt.engine.core.common.action.AddVmTemplateParameters;
import org.ovirt.engine.core.common.action.VdcActionParametersBase;
@@ -84,10 +82,6 @@
private <T> T readJsonString(Object source, Class<T> type, ObjectMapper
mapper) {
try {
return mapper.readValue(source.toString(), type);
- } catch (JsonParseException e) {
- throw new SerializationException(e);
- } catch (JsonMappingException e) {
- throw new SerializationException(e);
} catch (IOException e) {
throw new SerializationException(e);
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializer.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializer.java
index ee96602..3c85654 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializer.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/serialization/json/JsonObjectSerializer.java
@@ -7,8 +7,6 @@
import java.io.Serializable;
import org.apache.commons.lang.SerializationException;
-import org.codehaus.jackson.JsonGenerationException;
-import org.codehaus.jackson.map.JsonMappingException;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.map.SerializationConfig.Feature;
import org.ovirt.engine.core.common.action.AddVmTemplateParameters;
@@ -72,10 +70,6 @@
private String writeJsonAsString(Object payload, ObjectMapper mapper) {
try {
return mapper.writeValueAsString(payload);
- } catch (JsonGenerationException e) {
- throw new SerializationException(e);
- } catch (JsonMappingException e) {
- throw new SerializationException(e);
} catch (IOException e) {
throw new SerializationException(e);
}
diff --git
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java
index 30e7c4c..625c8a3 100644
---
a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java
+++
b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/transaction/TransactionSupport.java
@@ -227,19 +227,8 @@
tm.commit();
}
- } catch (SystemException e) {
- throw new RuntimeException("Failed managing transaction", e);
- } catch (SecurityException e) {
- throw new RuntimeException("Failed managing transaction", e);
- } catch (IllegalStateException e) {
- throw new RuntimeException("Failed managing transaction", e);
- } catch (RollbackException e) {
- throw new RuntimeException("Failed managing transaction", e);
- } catch (HeuristicMixedException e) {
- throw new RuntimeException("Failed managing transaction", e);
- } catch (HeuristicRollbackException e) {
- throw new RuntimeException("Failed managing transaction", e);
- } catch (NotSupportedException e) {
+ } catch (SystemException | NotSupportedException |
HeuristicRollbackException | HeuristicMixedException |
+ RollbackException | IllegalStateException | SecurityException
e) {
throw new RuntimeException("Failed managing transaction", e);
} finally {
// check if we need to resume previous transaction
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
index da6e7f1..e0b63a3 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsManager.java
@@ -249,8 +249,6 @@
logNetworkException(e);
} catch (VDSRecoveringException ex) {
HandleVdsRecoveringException(ex);
- } catch (IRSErrorException ex) {
- logFailureMessage(ex);
} catch (RuntimeException ex) {
logFailureMessage(ex);
}
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
index c9b2bf7..1dac264 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java
@@ -1538,9 +1538,7 @@
}
} catch (IRSUnicodeArgumentException ex) {
throw new IRSGenericException("UNICODE characters are not
supported.", ex);
- } catch (IRSStoragePoolStatusException ex) {
- throw ex;
- } catch (IrsOperationFailedNoFailoverException ex) {
+ } catch (IRSStoragePoolStatusException |
IrsOperationFailedNoFailoverException ex) {
throw ex;
} catch (IRSNonOperationalException ex) {
getVDSReturnValue().setExceptionString(ex.toString());
diff --git
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java
index 174deda..c98da1c 100644
---
a/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java
+++
b/backend/manager/tools/src/main/java/org/ovirt/engine/core/domains/ManageDomains.java
@@ -326,9 +326,7 @@
try {
return
LdapProviderType.valueOfIgnoreCase(parser.getArg(Arguments.provider.name()));
- } catch (IllegalArgumentException i) {
- // continue and print message
- } catch (NullPointerException e) {
+ } catch (IllegalArgumentException | NullPointerException i) {
// continue and print message
}
--
To view, visit http://gerrit.ovirt.org/18871
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37e468c40a9542e833b3e342fab023a7cde8ffe6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
