use jdbctemplate batchupdate in datatables where > 1 update in a db transaction

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java

@@ -109,24 +109,9 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
         // FIXME - KW - hardcoded supported app tables are m_loan or m_client?
         validateAppTable(applicationTableName);
 
-        try {
-            // TODO - JW - put in batch command later
         final String registerDatatableSql = "insert into x_registered_table (registered_table_name, application_table_name) values ('"
                 + dataTableName + "', '" + applicationTableName + "')";
         
-            this.jdbcTemplate.update(registerDatatableSql);
-        } catch (DataIntegrityViolationException dve) {
-            Throwable realCause = dve.getMostSpecificCause();
-            if (realCause.getMessage().contains("Duplicate entry")) { throw new PlatformDataIntegrityException(
-                    "error.msg.datatable.registered", "Datatable `" + dataTableName
-                            + "` is already registered against an application table.", "dataTableName", dataTableName); }
-
-            logAsErrorUnexpectedDataIntegrityException(dve);
-            throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue",
-                    "Unknown data integrity issue with resource.");
-        }
-
-        try {
         final String createPermission = "'CREATE_" + dataTableName + "'";
         final String createPermissionChecker = "'CREATE_" + dataTableName + "_CHECKER'";
         final String readPermission = "'READ_" + dataTableName + "'";
@@ -171,34 +156,40 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
                 + ", 'DELETE', '"
                 + dataTableName + "', false)";
 
-            this.jdbcTemplate.update(permissionsSql);
+        
+        
+        try {
+            String[] sqlArray = {registerDatatableSql, permissionsSql};
+            this.jdbcTemplate.batchUpdate(sqlArray);
+            
         } catch (DataIntegrityViolationException dve) {
             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")) { throw new PlatformDataIntegrityException(
-                    "error.msg.permissions.datatable.duplicate", "Permissions for datatable `" + dataTableName + "` already exist.",
+                    "error.msg.datatable.registered", "Datatable `" + dataTableName
-                    "dataTableName", dataTableName); }
+                            + "` is already registered against an application table.", "dataTableName", dataTableName); }
 
             logAsErrorUnexpectedDataIntegrityException(dve);
             throw new PlatformDataIntegrityException("error.msg.unknown.data.integrity.issue",
                     "Unknown data integrity issue with resource.");
         }
+
     }
 
     @Override
     public void deregisterDatatable(final String datatable) {
-        // TODO - JW - put in batch command later
         final String permissionList = "('CREATE_" + datatable + "', 'CREATE_" + datatable + "_CHECKER', 'READ_" + datatable + "', 'UPDATE_"
                 + datatable + "', 'UPDATE_" + datatable + "_CHECKER', 'DELETE_" + datatable + "', 'DELETE_" + datatable + "_CHECKER')";
 
         final String deleteRolePermissionsSql = "delete from m_role_permission where m_role_permission.permission_id in (select id from m_permission where code in "
                 + permissionList + ")";
-        this.jdbcTemplate.update(deleteRolePermissionsSql);
 
         final String deletePermissionsSql = "delete from m_permission where code in " + permissionList;
-        this.jdbcTemplate.update(deletePermissionsSql);
 
         final String deleteRegisteredDatatableSql = "delete from x_registered_table where registered_table_name = '" + datatable + "'";        
-        this.jdbcTemplate.update(deleteRegisteredDatatableSql);
+
+        String[] sqlArray = {deleteRolePermissionsSql, deletePermissionsSql, deleteRegisteredDatatableSql};
+        this.jdbcTemplate.batchUpdate(sqlArray);
     }
 
     @Override