dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40382
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20469: Upgraded to quick 1.12. Improves performance of data value import.
------------------------------------------------------------
revno: 20469
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-10-02 13:27:19 +0200
message:
Upgraded to quick 1.12. Improves performance of data value import.
modified:
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MapBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MinMaxDataElementBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/RelativePeriodsBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties
dhis-2/pom.xml
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public CategoryCategoryOptionAssociationBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public CategoryComboCategoryAssociationBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CompleteDataSetRegistrationBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public CompleteDataSetRegistrationBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ConstantBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public ConstantBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java 2015-09-15 09:54:24 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementCategoryBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryComboBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementCategoryComboBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementCategoryOptionBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementGroupBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementGroupMemberBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementGroupSetBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataElementGroupSetMemberBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java 2015-09-02 16:15:15 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataSetBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataSetCompletenessResultBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataSetMemberBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public DataSetSourceAssociationBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataValueBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -47,7 +47,7 @@
public DataValueBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GenericBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -46,7 +46,7 @@
public GenericBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public GroupSetBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public GroupSetMemberBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public ImportDataValueBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public IndicatorBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public IndicatorGroupBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public IndicatorGroupMemberBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public IndicatorGroupSetBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public IndicatorGroupSetMemberBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public IndicatorTypeBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MapBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MapBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MapBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -44,7 +44,7 @@
public MapBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MinMaxDataElementBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MinMaxDataElementBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/MinMaxDataElementBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -44,7 +44,7 @@
public MinMaxDataElementBatchHandler( JdbcConfiguration config )
{
- super( config, false, true );
+ super( config, true );
}
@Override
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public OrganisationUnitBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public OrganisationUnitGroupBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public OrganisationUnitGroupMemberBatchHandler( JdbcConfiguration config )
{
- super( config, true, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/PeriodBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public PeriodBatchHandler( JdbcConfiguration config )
{
- super( config, false, true );
+ super( config, true );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/RelativePeriodsBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/RelativePeriodsBatchHandler.java 2015-03-31 15:22:00 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/RelativePeriodsBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -41,7 +41,7 @@
public RelativePeriodsBatchHandler( JdbcConfiguration configuration )
{
- super( configuration, false, false );
+ super( configuration, false );
}
// -------------------------------------------------------------------------
// AbstractBatchHandler implementation
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java 2015-09-04 14:39:54 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ReportTableBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -45,7 +45,7 @@
public ReportTableBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ValidationRuleBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -41,7 +41,7 @@
public ValidationRuleBatchHandler( JdbcConfiguration config )
{
- super( config, false, false );
+ super( config, false );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java 2015-10-02 08:35:40 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/mock/batchhandler/MockBatchHandler.java 2015-10-02 11:27:19 +0000
@@ -29,8 +29,6 @@
*/
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
import java.util.List;
import org.amplecode.quick.BatchHandler;
@@ -70,12 +68,6 @@
return inserts.add( object );
}
- public int insertObject( T object, boolean returnGeneratedIdentifier )
- {
- inserts.add( object );
- return 0;
- }
-
@Override
public void updateObject( T object )
{
@@ -101,9 +93,8 @@
}
@Override
- public Collection<Integer> flush()
+ public void flush()
{
- return new HashSet<>();
}
public List<T> getInserts()
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2015-09-26 16:08:33 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/org/hisp/dhis/importexport/i18n_module.properties 2015-10-02 11:27:19 +0000
@@ -422,3 +422,4 @@
include_selected=Selected organisation unit
include_children=Include children of organisation unit
include_descendants=Include descendants of organisation unit
+data_export=Data Export
\ No newline at end of file
=== modified file 'dhis-2/pom.xml'
--- dhis-2/pom.xml 2015-10-01 13:57:42 +0000
+++ dhis-2/pom.xml 2015-10-02 11:27:19 +0000
@@ -589,7 +589,7 @@
<dependency>
<groupId>org.amplecode</groupId>
<artifactId>quick</artifactId>
- <version>1.11</version>
+ <version>1.12</version>
</dependency>
<dependency>
<groupId>org.amplecode</groupId>
