=== renamed file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DataMartEngine.java' => 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartEngine.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DataMartEngine.java 2012-02-12 13:16:57 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartEngine.java 2012-02-12 20:32:14 +0000 @@ -1,4 +1,4 @@ -package org.hisp.dhis.datamart.engine; +package org.hisp.dhis.datamart; /* * Copyright (c) 2004-2012, University of Oslo @@ -38,10 +38,24 @@ */ public interface DataMartEngine { + final String ID = DataMartEngine.class.getName(); + final Set DUMMY_ORG_UNIT_GROUPS = new HashSet() { { add( null ); } }; + + /** + * Exports aggregated values to the data mart tables. + * + * @param dataElementIds the data element identifiers. + * @param indicatorIds the indicator identifiers. + * @param periodIds the period identifiers. + * @param organisationUnitIds the organisation unit identifiers. + * @param processState the state object. + */ + void export( Collection dataElementIds, Collection indicatorIds, + Collection periodIds, Collection organisationUnitIds ); /** * Exports aggregated values to the data mart tables. @@ -51,10 +65,8 @@ * @param periodIds the period identifiers. * @param organisationUnitIds the organisation unit identifiers. * @param organisationUnitGroupIds the organisation unit group identifiers. - * @param completeExport indicates whether this is a complete export. * @param processState the state object. */ void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds, Collection organisationUnitGroupIds, - boolean completeExport ); + Collection periodIds, Collection organisationUnitIds, Collection organisationUnitGroupIds ); } === removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartService.java 2012-02-12 19:57:05 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datamart/DataMartService.java 1970-01-01 00:00:00 +0000 @@ -1,78 +0,0 @@ -package org.hisp.dhis.datamart; - -/* - * Copyright (c) 2004-2012, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import java.util.Collection; - -import org.hisp.dhis.period.RelativePeriods; - -/** - * @author Lars Helge Overland - */ -public interface DataMartService -{ - final String ID = DataMartService.class.getName(); - - /** - * Exports to data mart for the given arguments. - * - * @param dataElementIds the data element identifiers. - * @param indicatorIds the indicator identifiers. - * @param periodIds the period identifiers. - * @param organisationUnitIds the organisation unit identifiers. - */ - void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds ); - - /** - * Exports to data mart for the given arguments. - * - * @param dataElementIds the data element identifiers. - * @param indicatorIds the indicator identifiers. - * @param periodIds the period identifiers. - * @param organisationUnitIds the organisation unit identifiers. - * @param relatives the RelativePeriods. - */ - void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds, RelativePeriods relatives ); - - /** - * Exports to data mart for the given arguments. - * - * @param dataElementIds the data element identifiers. - * @param indicatorIds the indicator identifiers. - * @param periodIds the period identifiers. - * @param organisationUnitIds the organisation unit identifiers. - * @param organisationUnitGroupIds the organisation unit group identifiers. - * @param relatives the RelativePeriods. - * @param completeExport indicates whether this is a complete export. - */ - void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds, Collection organisationUnitGroupIds, - RelativePeriods relatives, boolean completeExport ); -} === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java 2012-01-09 20:03:56 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/dataelement/DefaultDataElementDataMart.java 2012-02-12 20:32:14 +0000 @@ -47,7 +47,7 @@ import org.hisp.dhis.datamart.DataElementOperandList; import org.hisp.dhis.datamart.aggregation.cache.AggregationCache; import org.hisp.dhis.datamart.aggregation.dataelement.DataElementAggregator; -import org.hisp.dhis.datamart.engine.DataMartEngine; +import org.hisp.dhis.datamart.DataMartEngine; import org.hisp.dhis.jdbc.batchhandler.GenericBatchHandler; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2012-02-12 19:23:31 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/engine/DefaultDataMartEngine.java 2012-02-12 20:32:14 +0000 @@ -27,6 +27,10 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.setting.SystemSettingManager.DEFAULT_ORGUNITGROUPSET_AGG_LEVEL; +import static org.hisp.dhis.setting.SystemSettingManager.KEY_ORGUNITGROUPSET_AGG_LEVEL; +import static org.hisp.dhis.system.notification.NotificationCategory.DATAMART; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -42,6 +46,7 @@ import org.hisp.dhis.dataelement.DataElementOperand; import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.datamart.DataElementOperandList; +import org.hisp.dhis.datamart.DataMartEngine; import org.hisp.dhis.datamart.crosstab.CrossTabService; import org.hisp.dhis.datamart.dataelement.DataElementDataMart; import org.hisp.dhis.datamart.indicator.IndicatorDataMart; @@ -52,7 +57,6 @@ import org.hisp.dhis.jdbc.batchhandler.AggregatedIndicatorValueBatchHandler; import org.hisp.dhis.jdbc.batchhandler.AggregatedOrgUnitDataValueBatchHandler; import org.hisp.dhis.jdbc.batchhandler.AggregatedOrgUnitIndicatorValueBatchHandler; -import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.organisationunit.OrganisationUnitGroupService; @@ -60,6 +64,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodService; +import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.filter.AggregatableDataElementFilter; import org.hisp.dhis.system.filter.OrganisationUnitAboveOrEqualToLevelFilter; import org.hisp.dhis.system.filter.PastAndCurrentPeriodFilter; @@ -72,9 +77,6 @@ import org.hisp.dhis.system.util.SystemUtils; import org.springframework.transaction.annotation.Transactional; -import static org.hisp.dhis.setting.SystemSettingManager.*; -import static org.hisp.dhis.system.notification.NotificationCategory.DATAMART; - /** * @author Lars Helge Overland */ @@ -189,8 +191,14 @@ @Transactional public void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds, Collection organisationUnitGroupIds, - boolean completeExport ) + Collection periodIds, Collection organisationUnitIds ) + { + export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, new HashSet() ); + } + + @Transactional + public void export( Collection dataElementIds, Collection indicatorIds, + Collection periodIds, Collection organisationUnitIds, Collection organisationUnitGroupIds ) { final int cpuCores = SystemUtils.getCpuCores(); @@ -325,15 +333,8 @@ // 3. Delete existing aggregated datavalues // --------------------------------------------------------------------- - if ( completeExport ) - { - aggregatedDataValueService.deleteAggregatedDataValues( periodIds ); - } - else - { - aggregatedDataValueService.deleteAggregatedDataValues( dataElementIds, periodIds, organisationUnitIds ); - } - + aggregatedDataValueService.deleteAggregatedDataValues( periodIds ); + clock.logTime( "Deleted existing aggregated datavalues" ); notifier.notify( DATAMART, "Exporting data for data elements" ); @@ -365,15 +366,8 @@ // 5. Delete existing aggregated indicatorvalues // --------------------------------------------------------------------- - if ( completeExport ) - { - aggregatedDataValueService.deleteAggregatedIndicatorValues( periodIds ); - } - else - { - aggregatedDataValueService.deleteAggregatedIndicatorValues( indicatorIds, periodIds, organisationUnitIds ); - } - + aggregatedDataValueService.deleteAggregatedIndicatorValues( periodIds ); + clock.logTime( "Deleted existing aggregated indicatorvalues" ); notifier.notify( DATAMART, "Exporting data for indicators" ); @@ -408,14 +402,10 @@ // --------------------------------------------------------------------- // 8. Create potential indexes // --------------------------------------------------------------------- - - if ( completeExport ) - { - aggregatedDataValueService.createIndex( true, isIndicators ); - - clock.logTime( "Created indexes" ); - } - + + aggregatedDataValueService.createIndex( true, isIndicators ); + + clock.logTime( "Created indexes" ); clock.logTime( "Aggregated data export done" ); final boolean isGroups = organisationUnitGroups != null && organisationUnitGroups.size() > 0; @@ -446,15 +436,8 @@ // 3. Delete existing aggregated datavalues // --------------------------------------------------------------------- - if ( completeExport ) - { - aggregatedOrgUnitDataValueService.deleteAggregatedDataValues( periodIds ); - } - else - { - aggregatedOrgUnitDataValueService.deleteAggregatedDataValues( dataElementIds, periodIds, organisationUnitIds ); - } - + aggregatedOrgUnitDataValueService.deleteAggregatedDataValues( periodIds ); + clock.logTime( "Deleted existing aggregated org unit datavalues" ); notifier.notify( DATAMART, "Exporting data for data elements" ); @@ -490,15 +473,8 @@ // 5. Delete existing aggregated indicatorvalues // --------------------------------------------------------------------- - if ( completeExport ) - { - aggregatedOrgUnitDataValueService.deleteAggregatedIndicatorValues( periodIds ); - } - else - { - aggregatedOrgUnitDataValueService.deleteAggregatedIndicatorValues( indicatorIds, periodIds, organisationUnitIds ); - } - + aggregatedOrgUnitDataValueService.deleteAggregatedIndicatorValues( periodIds ); + clock.logTime( "Deleted existing aggregated org unit indicatorvalues" ); notifier.notify( DATAMART, "Exporting data for indicators" ); @@ -534,13 +510,9 @@ // 8. Create potential indexes // --------------------------------------------------------------------- - if ( completeExport ) - { - aggregatedOrgUnitDataValueService.createIndex( true, isIndicators ); - - clock.logTime( "Created org unit indexes" ); - } - + aggregatedOrgUnitDataValueService.createIndex( true, isIndicators ); + + clock.logTime( "Created org unit indexes" ); clock.logTime( "Aggregated organisation unit data export done" ); } === removed directory 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/impl' === removed file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/impl/DefaultDataMartService.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/impl/DefaultDataMartService.java 2012-02-12 19:57:05 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/impl/DefaultDataMartService.java 1970-01-01 00:00:00 +0000 @@ -1,91 +0,0 @@ -package org.hisp.dhis.datamart.impl; - -/* - * Copyright (c) 2004-2012, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import static org.hisp.dhis.system.util.ConversionUtils.getIdentifiers; - -import java.util.Collection; - -import org.hisp.dhis.datamart.DataMartService; -import org.hisp.dhis.datamart.engine.DataMartEngine; -import org.hisp.dhis.period.Period; -import org.hisp.dhis.period.PeriodService; -import org.hisp.dhis.period.RelativePeriods; - -/** - * @author Lars Helge Overland - */ -public class DefaultDataMartService - implements DataMartService -{ - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private DataMartEngine dataMartEngine; - - public void setDataMartEngine( DataMartEngine dataMartEngine ) - { - this.dataMartEngine = dataMartEngine; - } - - private PeriodService periodService; - - public void setPeriodService( PeriodService periodService ) - { - this.periodService = periodService; - } - - // ------------------------------------------------------------------------- - // Export - // ------------------------------------------------------------------------- - - public void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds ) - { - dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, null, false ); - } - - public void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds, RelativePeriods relatives ) - { - export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, null, relatives, false ); - } - - public void export( Collection dataElementIds, Collection indicatorIds, - Collection periodIds, Collection organisationUnitIds, Collection organisationUnitGroupIds, - RelativePeriods relatives, boolean completeExport ) - { - if ( relatives != null ) - { - periodIds.addAll( getIdentifiers( Period.class, periodService.reloadPeriods( relatives.getRelativePeriods() ) ) ); - } - - dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds, completeExport ); - } -} === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java 2012-02-02 20:01:36 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java 2012-02-12 20:32:14 +0000 @@ -47,7 +47,7 @@ import org.hisp.dhis.dataelement.DataElementOperand; import org.hisp.dhis.datamart.aggregation.cache.AggregationCache; import org.hisp.dhis.datamart.crosstab.CrossTabService; -import org.hisp.dhis.datamart.engine.DataMartEngine; +import org.hisp.dhis.datamart.DataMartEngine; import org.hisp.dhis.expression.ExpressionService; import org.hisp.dhis.indicator.Indicator; import org.hisp.dhis.setting.SystemSettingManager; === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml 2012-02-12 19:57:05 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml 2012-02-12 20:32:14 +0000 @@ -4,17 +4,10 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.1.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd"> - - - - - - - - + - + @@ -110,7 +103,7 @@ - + === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceAggregationLevelsTest.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceAggregationLevelsTest.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceAggregationLevelsTest.java 2012-02-12 20:32:14 +0000 @@ -58,7 +58,7 @@ public class DataMartServiceAggregationLevelsTest extends DhisTest { - private DataMartService dataMartService; + private DataMartEngine dataMartEngine; private AggregatedDataValueService aggregatedDataValueService; @@ -95,7 +95,7 @@ @Override public void setUpTest() { - dataMartService = (DataMartService) getBean( DataMartService.ID ); + dataMartEngine = (DataMartEngine) getBean( DataMartEngine.ID ); aggregatedDataValueService = (AggregatedDataValueService) getBean( AggregatedDataValueService.ID ); @@ -218,7 +218,7 @@ dataElementService.updateDataElement( dataElement ); - dataMartService.export( dataElementIds, new ArrayList(), periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, new ArrayList(), periodIds, organisationUnitIds ); assertEquals( 280.0, aggregatedDataValueService.getAggregatedValue( dataElement, categoryOptionCombo, period, unitA ) ); assertEquals( 240.0, aggregatedDataValueService.getAggregatedValue( dataElement, categoryOptionCombo, period, unitB ) ); @@ -244,7 +244,7 @@ dataElementService.updateDataElement( dataElement ); - dataMartService.export( dataElementIds, new ArrayList(), periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, new ArrayList(), periodIds, organisationUnitIds ); assertEquals( 280.0, aggregatedDataValueService.getAggregatedValue( dataElement, categoryOptionCombo, period, unitA ) ); assertEquals( 240.0, aggregatedDataValueService.getAggregatedValue( dataElement, categoryOptionCombo, period, unitB ) ); === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceMultiDimensionTest.java 2012-02-12 20:32:14 +0000 @@ -70,7 +70,7 @@ private final String T = "true"; private final String F = "false"; - private DataMartService dataMartService; + private DataMartEngine dataMartEngine; private AggregatedDataValueService aggregatedDataValueService; @@ -107,7 +107,7 @@ // Dependencies // --------------------------------------------------------------------- - dataMartService = (DataMartService) getBean( DataMartService.ID ); + dataMartEngine = (DataMartEngine) getBean( DataMartEngine.ID ); aggregatedDataValueService = (AggregatedDataValueService) getBean( AggregatedDataValueService.ID ); @@ -262,7 +262,7 @@ // Test // --------------------------------------------------------------------- - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, null ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, null ); assertEquals( 90.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodA, unitB ) ); assertEquals( 70.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodB, unitB ) ); @@ -316,7 +316,7 @@ // Test // --------------------------------------------------------------------- - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, null ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, null ); assertEquals( 90.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodA, unitB ) ); assertEquals( 70.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodB, unitB ) ); @@ -370,7 +370,7 @@ // Test // --------------------------------------------------------------------- - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( 1.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodA, unitB ) ); assertEquals( 0.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodB, unitB ) ); @@ -424,7 +424,7 @@ // Test // --------------------------------------------------------------------- - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( 100.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodA, unitB ) ); assertEquals( 0.0, aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionComboA, periodB, unitB ) ); @@ -493,7 +493,7 @@ // Test // --------------------------------------------------------------------- - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( 2700.0, aggregatedDataValueService.getAggregatedValue( indicatorA, periodA, unitB ) ); assertEquals( 600.0, aggregatedDataValueService.getAggregatedValue( indicatorA, periodB, unitB ) ); @@ -560,7 +560,7 @@ // Test // --------------------------------------------------------------------- - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( 12.0, aggregatedDataValueService.getAggregatedValue( indicatorB, periodA, unitB ) ); assertEquals( 5.0, aggregatedDataValueService.getAggregatedValue( indicatorB, periodB, unitB ) ); @@ -634,7 +634,7 @@ // Test // --------------------------------------------------------------------- - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( 31790.3, aggregatedDataValueService.getAggregatedValue( indicatorA, periodA, unitB ) ); assertEquals( 7064.5, aggregatedDataValueService.getAggregatedValue( indicatorA, periodB, unitB ) ); === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceOrgUnitTest.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceOrgUnitTest.java 2012-02-12 13:13:54 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceOrgUnitTest.java 2012-02-12 20:32:14 +0000 @@ -70,7 +70,7 @@ private final String T = "true"; private final String F = "false"; - private DataMartService dataMartService; + private DataMartEngine dataMartEngine; private DataElementCategoryCombo categoryCombo; @@ -111,7 +111,7 @@ @Override public void setUpTest() { - dataMartService = (DataMartService) getBean( DataMartService.ID ); + dataMartEngine = (DataMartEngine) getBean( DataMartEngine.ID ); aggregatedOrgUnitDataValueService = (AggregatedOrgUnitDataValueService) getBean( AggregatedOrgUnitDataValueService.ID ); @@ -302,7 +302,7 @@ dataElementService.updateDataElement( dataElementA ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds, null, false ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds ); assertEquals( 145.0, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitA, groupA ) ); assertEquals( 145.0, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitB, groupA ) ); @@ -336,7 +336,7 @@ dataElementService.updateDataElement( dataElementA ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds, null, false ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds ); assertEquals( 145.0, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitA, groupA ) ); assertEquals( 145.0, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitB, groupA ) ); @@ -370,7 +370,7 @@ dataElementService.updateDataElement( dataElementB ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds, null, false ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds ); assertEquals( 1.0, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitA, groupA ) ); assertEquals( 1.0, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitB, groupA ) ); @@ -404,7 +404,7 @@ dataElementService.updateDataElement( dataElementB ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds, null, false ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds ); assertEquals( 33.3, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitA, groupA ) ); assertEquals( 33.3, aggregatedOrgUnitDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitB, groupA ) ); @@ -512,7 +512,7 @@ indicatorIds.add( indicatorService.addIndicator( indicatorA ) ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds, null, false ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds ); // --------------------------------------------------------------------- // Assert === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTest.java 2012-02-12 20:32:14 +0000 @@ -67,7 +67,7 @@ private final String T = "true"; private final String F = "false"; - private DataMartService dataMartService; + private DataMartEngine dataMartEngine; private AggregatedDataValueService aggregatedDataValueService; @@ -103,7 +103,7 @@ @Override public void setUpTest() { - dataMartService = (DataMartService) getBean( DataMartService.ID ); + dataMartEngine = (DataMartEngine) getBean( DataMartEngine.ID ); aggregatedDataValueService = (AggregatedDataValueService) getBean( AggregatedDataValueService.ID ); @@ -267,7 +267,7 @@ dataElementService.updateDataElement( dataElementA ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitA ), 240.0 ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitB ), 150.0 ); @@ -295,7 +295,7 @@ dataElementService.updateDataElement( dataElementA ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitA ), 240.0 ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementA, categoryOptionCombo, periodA, unitB ), 150.0 ); @@ -323,7 +323,7 @@ dataElementService.updateDataElement( dataElementB ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitA ), 4.0 ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitB ), 3.0 ); @@ -351,7 +351,7 @@ dataElementService.updateDataElement( dataElementB ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitA ), 66.7 ); assertEquals( aggregatedDataValueService.getAggregatedValue( dataElementB, categoryOptionCombo, periodA, unitB ), 60.0 ); @@ -465,7 +465,7 @@ indicatorIds.add( indicatorService.addIndicator( indicatorA ) ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); // --------------------------------------------------------------------- // Assert @@ -551,7 +551,7 @@ indicatorIds.add( indicatorService.addIndicator( indicatorA ) ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); // --------------------------------------------------------------------- // Assert === modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTimeDimensionTest.java' --- dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTimeDimensionTest.java 2011-12-26 10:07:59 +0000 +++ dhis-2/dhis-services/dhis-service-datamart-default/src/test/java/org/hisp/dhis/datamart/DataMartServiceTimeDimensionTest.java 2012-02-12 20:32:14 +0000 @@ -58,7 +58,7 @@ public class DataMartServiceTimeDimensionTest extends DhisTest { - private DataMartService dataMartService; + private DataMartEngine dataMartEngine; private AggregatedDataValueService aggregatedDataValueService; @@ -74,7 +74,7 @@ @Override public void setUpTest() { - dataMartService = (DataMartService) getBean( DataMartService.ID ); + dataMartEngine = (DataMartEngine) getBean( DataMartEngine.ID ); aggregatedDataValueService = (AggregatedDataValueService) getBean( AggregatedDataValueService.ID ); @@ -138,7 +138,7 @@ periodIds.add( periodService.addPeriod( periodB ) ); periodIds.add( periodService.addPeriod( periodC ) ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( 100.0, aggregatedDataValueService.getAggregatedValue( dataElement, categoryOptionCombo, periodA, unit ) ); assertEquals( 100.0, aggregatedDataValueService.getAggregatedValue( dataElement, categoryOptionCombo, periodB, unit ) ); @@ -177,7 +177,7 @@ periodIds.add( periodService.addPeriod( periodA ) ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds ); assertEquals( 60.0, aggregatedDataValueService.getAggregatedValue( dataElement, categoryOptionCombo, periodA, unit ) ); } === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2012-02-12 12:21:49 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/META-INF/dhis/beans.xml 2012-02-12 20:32:14 +0000 @@ -248,7 +248,7 @@ - + === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java 2012-02-12 17:11:20 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/InMemoryNotifier.java 2012-02-12 20:32:14 +0000 @@ -1,11 +1,41 @@ package org.hisp.dhis.system.notification; +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import java.util.ArrayList; import java.util.Date; import java.util.List; import javax.annotation.PostConstruct; +/** + * @author Lars Helge Overland + */ public class InMemoryNotifier implements Notifier { === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notification.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notification.java 2012-02-12 13:16:57 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notification.java 2012-02-12 20:32:14 +0000 @@ -1,9 +1,39 @@ package org.hisp.dhis.system.notification; +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import java.util.Date; import org.hisp.dhis.common.CodeGenerator; +/** + * @author Lars Helge Overland + */ public class Notification { private String uid; === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/NotificationCategory.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/NotificationCategory.java 2012-02-12 13:16:57 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/NotificationCategory.java 2012-02-12 20:32:14 +0000 @@ -1,5 +1,35 @@ package org.hisp.dhis.system.notification; +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Lars Helge Overland + */ public enum NotificationCategory { DATAMART, === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/NotificationLevel.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/NotificationLevel.java 2012-02-12 13:16:57 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/NotificationLevel.java 2012-02-12 20:32:14 +0000 @@ -1,5 +1,35 @@ package org.hisp.dhis.system.notification; +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Lars Helge Overland + */ public enum NotificationLevel { INFO, === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java 2012-02-12 13:38:06 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/notification/Notifier.java 2012-02-12 20:32:14 +0000 @@ -1,7 +1,37 @@ package org.hisp.dhis.system.notification; +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import java.util.List; +/** + * @author Lars Helge Overland + */ public interface Notifier { void notify( NotificationCategory category, String message ); === modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.java' --- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.java 2012-02-12 13:38:06 +0000 +++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/scheduling/DataMartTask.java 2012-02-12 20:32:14 +0000 @@ -41,7 +41,7 @@ import org.hisp.dhis.completeness.DataSetCompletenessService; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.datamart.DataMartService; +import org.hisp.dhis.datamart.DataMartEngine; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.indicator.Indicator; @@ -68,7 +68,7 @@ { private static final Log log = LogFactory.getLog( DataMartTask.class ); - private DataMartService dataMartService; + private DataMartEngine dataMartEngine; private DataSetCompletenessService completenessService; @@ -119,12 +119,12 @@ { } - public DataMartTask( DataMartService dataMartService, DataSetCompletenessService completenessService, + public DataMartTask( DataMartEngine dataMartEngine, DataSetCompletenessService completenessService, DataElementService dataElementService, IndicatorService indicatorService, PeriodService periodService, OrganisationUnitService organisationUnitService, OrganisationUnitGroupService organisationUnitGroupService, DataSetService dataSetService, SystemSettingManager systemSettingManager ) { - this.dataMartService = dataMartService; + this.dataMartEngine = dataMartEngine; this.completenessService = completenessService; this.dataElementService = dataElementService; this.indicatorService = indicatorService; @@ -157,7 +157,7 @@ Collection periodIds = ConversionUtils.getIdentifiers( Period.class, periodService.reloadPeriods( periods ) ); - dataMartService.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds, null, true ); + dataMartEngine.export( dataElementIds, indicatorIds, periodIds, organisationUnitIds, organisationUnitGroupIds ); completenessService.exportDataSetCompleteness( dataSetIds, periodIds, organisationUnitIds ); } === modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java' --- dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java 2012-02-12 19:23:31 +0000 +++ dhis-2/dhis-web/dhis-web-reporting/src/main/java/org/hisp/dhis/reporting/datamart/action/StartExportAction.java 2012-02-12 20:32:14 +0000 @@ -1,5 +1,32 @@ package org.hisp.dhis.reporting.datamart.action; +/* + * Copyright (c) 2004-2012, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + import java.util.ArrayList; import java.util.Date; import java.util.HashSet; @@ -15,6 +42,9 @@ import com.opensymphony.xwork2.Action; +/** + * @author Lars Helge Overland + */ public class StartExportAction implements Action {