You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2016/05/04 10:57:16 UTC
[1/2] incubator-fineract git commit: Removing org.hibernate.exception
imports
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 2bd3b0625 -> a9f811ca6
Removing org.hibernate.exception imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/e552e04f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/e552e04f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/e552e04f
Branch: refs/heads/develop
Commit: e552e04fd42b675b7a05840996e07b6c89d43a51
Parents: 0480e08
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed Apr 27 10:28:45 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed Apr 27 10:28:45 2016 +0530
----------------------------------------------------------------------
.../ReadWriteNonCoreDataServiceImpl.java | 59 ++++----------------
1 file changed, 11 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/e552e04f/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
index 13edd7b..a9b79a5 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
@@ -57,9 +57,6 @@ import org.apache.fineract.infrastructure.dataqueries.exception.DatatableNotFoun
import org.apache.fineract.infrastructure.dataqueries.exception.DatatableSystemErrorException;
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
import org.apache.fineract.useradministration.domain.AppUser;
-import org.hibernate.exception.ConstraintViolationException;
-import org.hibernate.exception.GenericJDBCException;
-import org.hibernate.exception.SQLGrammarException;
import org.joda.time.LocalDate;
import org.joda.time.LocalDateTime;
import org.slf4j.Logger;
@@ -260,22 +257,13 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
}
}
- /***
- * Strangely, a Hibernate contraint violation exception is thrown
- ****/
- catch (final ConstraintViolationException cve) {
- final Throwable realCause = cve.getCause();
- // even if duplicate is only due to permission duplicate, okay to
- // show duplicate datatable error msg
- if (realCause.getMessage()
- .contains("Duplicate entry")) { throw new PlatformDataIntegrityException("error.msg.datatable.registered",
- "Datatable `" + dataTableName + "` is already registered against an application table.", "dataTableName",
- dataTableName); }
- } catch (final DataIntegrityViolationException dve) {
+ catch (final DataIntegrityViolationException dve) {
+ final Throwable cause = dve.getCause() ;
final Throwable realCause = dve.getMostSpecificCause();
// even if duplicate is only due to permission duplicate, okay to
// show duplicate datatable error msg
if (realCause.getMessage()
+ .contains("Duplicate entry") || cause.getMessage()
.contains("Duplicate entry")) { throw new PlatformDataIntegrityException("error.msg.datatable.registered",
"Datatable `" + dataTableName + "` is already registered against an application table.", "dataTableName",
dataTableName); }
@@ -373,23 +361,11 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
return commandProcessingResult; //
- } catch (final ConstraintViolationException dve) {
- // NOTE: jdbctemplate throws a
- // org.hibernate.exception.ConstraintViolationException even though
- // it should be a DataAccessException?
- final Throwable realCause = dve.getCause();
- if (realCause.getMessage()
- .contains("Duplicate entry")) { throw new PlatformDataIntegrityException(
- "error.msg.datatable.entry.duplicate", "An entry already exists for datatable `" + dataTableName
- + "` and application table with identifier `" + appTableId + "`.",
- "dataTableName", dataTableName, appTableId); }
-
- logAsErrorUnexpectedDataIntegrityException(dve);
- throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue",
- "Unknown data integrity issue with resource.");
} catch (final DataAccessException dve) {
+ final Throwable cause = dve.getCause() ;
final Throwable realCause = dve.getMostSpecificCause();
if (realCause.getMessage()
+ .contains("Duplicate entry") || cause.getMessage()
.contains("Duplicate entry")) { throw new PlatformDataIntegrityException(
"error.msg.datatable.entry.duplicate", "An entry already exists for datatable `" + dataTableName
+ "` and application table with identifier `" + appTableId + "`.",
@@ -419,23 +395,11 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
return commandProcessingResult; //
- } catch (final ConstraintViolationException dve) {
- // NOTE: jdbctemplate throws a
- // org.hibernate.exception.ConstraintViolationException even though
- // it should be a DataAccessException?
- final Throwable realCause = dve.getCause();
- if (realCause.getMessage()
- .contains("Duplicate entry")) { throw new PlatformDataIntegrityException(
- "error.msg.datatable.entry.duplicate", "An entry already exists for datatable `" + dataTableName
- + "` and application table with identifier `" + appTableId + "`.",
- "dataTableName", dataTableName, appTableId); }
-
- logAsErrorUnexpectedDataIntegrityException(dve);
- throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue",
- "Unknown data integrity issue with resource.");
} catch (final DataAccessException dve) {
+ final Throwable cause = dve.getCause() ;
final Throwable realCause = dve.getMostSpecificCause();
if (realCause.getMessage()
+ .contains("Duplicate entry") || cause.getMessage()
.contains("Duplicate entry")) { throw new PlatformDataIntegrityException(
"error.msg.datatable.entry.duplicate", "An entry already exists for datatable `" + dataTableName
+ "` and application table with identifier `" + appTableId + "`.",
@@ -594,7 +558,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
registerDatatable(datatableName, apptableName);
registerColumnCodeMapping(codeMappings);
- } catch (final SQLGrammarException e) {
+ } catch (final DataIntegrityViolationException e) {
final Throwable realCause = e.getCause();
final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("datatable");
@@ -949,10 +913,9 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
this.jdbcTemplate.execute(sqlBuilder.toString());
deleteColumnCodeMapping(removeMappings);
registerColumnCodeMapping(codeMappings);
- } catch (final GenericJDBCException e) {
+ } catch (final Exception e) {
if (e.getMessage().contains("Error on rename")) { throw new PlatformServiceUnavailableException(
"error.msg.datatable.column.update.not.allowed", "One of the column name modification not allowed"); }
- } catch (final Exception e) {
// handle all other exceptions in here
// check if exception message contains the
@@ -965,7 +928,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
"One of the data table columns contains null values"); }
}
}
- } catch (final SQLGrammarException e) {
+ } catch (final DataIntegrityViolationException e) {
final Throwable realCause = e.getCause();
final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("datatable");
@@ -1004,7 +967,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
final String sql = "DROP TABLE `" + datatableName + "`";
sqlArray[0] = sql;
this.jdbcTemplate.batchUpdate(sqlArray);
- } catch (final SQLGrammarException e) {
+ } catch (final DataIntegrityViolationException e) {
final Throwable realCause = e.getCause();
final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
final DataValidatorBuilder baseDataValidator = new DataValidatorBuilder(dataValidationErrors).resource("datatable");
[2/2] incubator-fineract git commit: Merge branch
'removehibernateexceptions' into develop
Posted by na...@apache.org.
Merge branch 'removehibernateexceptions' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/a9f811ca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/a9f811ca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/a9f811ca
Branch: refs/heads/develop
Commit: a9f811ca61f6370e0c992380a76f02d35f4902b9
Parents: 2bd3b06 e552e04
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Wed May 4 16:21:05 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Wed May 4 16:21:05 2016 +0530
----------------------------------------------------------------------
.../ReadWriteNonCoreDataServiceImpl.java | 59 ++++----------------
1 file changed, 11 insertions(+), 48 deletions(-)
----------------------------------------------------------------------