From 73e56588442ad9169a303643f4a1363da099c46a Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Fri, 8 Oct 2010 09:18:49 +0000 Subject: [PATCH] Removed exception handling for exceptions that are never thrown --- .../cdm/io/common/CdmDefaultIOBase.java | 26 +++++------- ...aunaEuropaeaAdditionalTaxonDataImport.java | 29 ++++++-------- .../cdm/io/test/function/TestDatabase.java | 15 ++----- .../test/integration/TestCdmDbComparator.java | 40 +++++++------------ 4 files changed, 39 insertions(+), 71 deletions(-) diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultIOBase.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultIOBase.java index 2a6879a341..a283506e13 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultIOBase.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultIOBase.java @@ -9,10 +9,8 @@ package eu.etaxonomy.cdm.io.common; import org.apache.log4j.Logger; import eu.etaxonomy.cdm.api.application.CdmApplicationController; -import eu.etaxonomy.cdm.database.DataSourceNotFoundException; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; -import eu.etaxonomy.cdm.model.common.init.TermNotFoundException; /** * This is an exporter that invokes the application aware defaultExport when invoked itself @@ -43,23 +41,17 @@ public class CdmDefaultIOBase { throw new IllegalArgumentException("The export may not run with DbSchemaValidation.CREATE or DbSchemaValidation.CREATE_DROP as this value deletes the source database"); } } - try { - if ( createNew == true || cdmApp == null){ - cdmApp = CdmApplicationController.NewInstance(cdmSource, schemaValidation, omitTermLoading); - if (cdmApp != null){ - return true; - }else{ - return false; - } + + if ( createNew == true || cdmApp == null){ + cdmApp = CdmApplicationController.NewInstance(cdmSource, schemaValidation, omitTermLoading); + if (cdmApp != null){ + return true; + }else{ + return false; } - return true; - } catch (DataSourceNotFoundException e) { - logger.error("could not connect to CDM database"); - return false; - }catch (TermNotFoundException e) { - logger.error("could not find required term in CDM database"); - return false; } + return true; + } diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaAdditionalTaxonDataImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaAdditionalTaxonDataImport.java index 3bc6362d28..f9ef12cc98 100644 --- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaAdditionalTaxonDataImport.java +++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaAdditionalTaxonDataImport.java @@ -9,7 +9,6 @@ package eu.etaxonomy.cdm.io.faunaEuropaea; -import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.HashSet; @@ -26,8 +25,6 @@ import eu.etaxonomy.cdm.io.common.Source; import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.name.TaxonNameBase; -import eu.etaxonomy.cdm.model.reference.ReferenceBase; -import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonBase; @@ -106,26 +103,26 @@ public class FaunaEuropaeaAdditionalTaxonDataImport extends FaunaEuropaeaImportB Set uuidSet = new HashSet(); FaunaEuropaeaImportConfigurator fauEuConfig = state.getConfig(); ICdmDataSource destination = fauEuConfig.getDestination(); + TransactionStatus txStatus = null; + List taxonNames = null; + txStatus = startTransaction(false); String selectQuery = "SELECT t.uuid from TaxonNameBase t INNER JOIN " + "TaxonNameBase t2 ON t.GenusOrUninomial = t2.GenusOrUninomial AND t.SpecificEpithet = t2.SpecificEpithet " + "WHERE t.InfraGenericEpithet IS NULL AND t.rank_id = 764 AND t2.rank_id = 766 AND t2.InfraGenericEpithet IS NOT NULL"; - logger.error("Retrieving TaxonNames..."); - ResultSet resultSet = destination.executeQuery(selectQuery); - - TransactionStatus txStatus = null; - List taxonNames = null; - txStatus = startTransaction(false); + logger.info("Retrieving TaxonNames..."); - // Collect UUIDs + ResultSet resultSet; try { + resultSet = destination.executeQuery(selectQuery); + + // Collect UUIDs while (resultSet.next()) { uuidSet.add(UUID.fromString(resultSet.getString("UUID"))); } } catch (SQLException e) { - logger.error("An error occured: " + e.getMessage()); - e.printStackTrace(); + logger.error("An error occured: ", e); } // Fetch TaxonName objects for UUIDs @@ -153,14 +150,14 @@ public class FaunaEuropaeaAdditionalTaxonDataImport extends FaunaEuropaeaImportB // set infraGenericEpithet // targetNonViralName.setInfraGenericEpithet(infraGenericEpithet); - logger.error("Added an InfraGenericEpithet to this TaxonName: " + taxonName.getUuid() + " (" + taxonName.getTitleCache() + ")"); + logger.info("Added an InfraGenericEpithet to this TaxonName: " + taxonName.getUuid() + " (" + taxonName.getTitleCache() + ")"); count++; } } } else if (foundTaxa.size() > 1) { - logger.error("Multiple taxa match search criteria: " + taxonName.getUuid() + " (" + taxonName.getTitleCache() + ")"); + logger.warn("Multiple taxa match search criteria: " + taxonName.getUuid() + " (" + taxonName.getTitleCache() + ")"); for (TaxonBase foundTaxon : foundTaxa) { - logger.error(foundTaxon.getUuid() + ", " + foundTaxon.getTitleCache()); + logger.warn(foundTaxon.getUuid() + ", " + foundTaxon.getTitleCache()); } } else if (foundTaxa.size() == 0) { // logger.error("No matches for search criteria: " + taxonName.getUuid() + " (" + taxonName.getTitleCache() + ")"); @@ -172,7 +169,7 @@ public class FaunaEuropaeaAdditionalTaxonDataImport extends FaunaEuropaeaImportB // Commit transaction commitTransaction(txStatus); - logger.error("Committed transaction."); + logger.info("Committed transaction."); return success; } diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java index c6b6d34699..edcf421484 100644 --- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java +++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java @@ -16,7 +16,6 @@ import org.springframework.transaction.TransactionStatus; import eu.etaxonomy.cdm.api.application.CdmApplicationController; import eu.etaxonomy.cdm.common.AccountStore; import eu.etaxonomy.cdm.database.CdmDataSource; -import eu.etaxonomy.cdm.database.DataSourceNotFoundException; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.jaxb.DataSet; @@ -28,11 +27,9 @@ import eu.etaxonomy.cdm.model.common.AnnotatableEntity; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.TimePeriod; import eu.etaxonomy.cdm.model.common.VersionableEntity; -import eu.etaxonomy.cdm.model.common.init.TermNotFoundException; import eu.etaxonomy.cdm.model.name.BotanicalName; import eu.etaxonomy.cdm.model.name.Rank; import eu.etaxonomy.cdm.model.name.TaxonNameBase; - import eu.etaxonomy.cdm.model.reference.ReferenceBase; import eu.etaxonomy.cdm.model.reference.ReferenceFactory; import eu.etaxonomy.cdm.model.taxon.Synonym; @@ -64,15 +61,9 @@ public class TestDatabase { logger.info("Initializing database '" + db.getName() + "'"); - CdmApplicationController appCtrInit = null; - try { - appCtrInit = CdmApplicationController.NewInstance(db, dbSchemaValidation, omitTermLoading); - } catch (DataSourceNotFoundException e) { - logger.error("Could not connect to database"); - }catch (TermNotFoundException e) { - logger.error("Terms not found in database. " + - "This error should not happen if preloaded terms are not expected for this application."); - } + CdmApplicationController appCtrInit = + CdmApplicationController.NewInstance(db, dbSchemaValidation, omitTermLoading); + return appCtrInit; } diff --git a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java index 03d56ab5f4..4d6f983ac7 100644 --- a/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java +++ b/cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java @@ -19,7 +19,6 @@ import org.springframework.transaction.TransactionStatus; import eu.etaxonomy.cdm.api.application.CdmApplicationController; import eu.etaxonomy.cdm.common.AccountStore; import eu.etaxonomy.cdm.database.CdmDataSource; -import eu.etaxonomy.cdm.database.DataSourceNotFoundException; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.Source; @@ -29,7 +28,6 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.common.Representation; import eu.etaxonomy.cdm.model.common.TermVocabulary; -import eu.etaxonomy.cdm.model.common.init.TermNotFoundException; import eu.etaxonomy.cdm.model.name.NomenclaturalStatus; import eu.etaxonomy.cdm.model.name.TypeDesignationBase; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; @@ -250,18 +248,13 @@ public class TestCdmDbComparator { CdmApplicationController appCtr = null; - try { - String password = AccountStore.readOrStorePassword(dbname, server, username, null); - - DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; - ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password); - appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true); - - } catch (DataSourceNotFoundException e) { - logger.error("datasource error"); - } catch (TermNotFoundException e) { - logger.error("defined terms not found"); - } + + String password = AccountStore.readOrStorePassword(dbname, server, username, null); + + DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; + ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password); + appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true); + TransactionStatus txStatus = appCtr.startTransaction(true); @@ -290,18 +283,13 @@ public class TestCdmDbComparator { CdmApplicationController appCtr = null; - try { - String password = AccountStore.readOrStorePassword(dbname, server, username, null); - - DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; - ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password); - appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true); - - } catch (DataSourceNotFoundException e) { - logger.error("datasource error"); - } catch (TermNotFoundException e) { - logger.error("defined terms not found"); - } + + String password = AccountStore.readOrStorePassword(dbname, server, username, null); + + DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; + ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password); + appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true); + TransactionStatus txStatus = appCtr.startTransaction(true); -- 2.34.1