dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #12058
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3595: Removed some startup routines, one of them caused problem with indicator formulas
------------------------------------------------------------
revno: 3595
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-05-12 14:26:59 +0200
message:
Removed some startup routines, one of them caused problem with indicator formulas
removed:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/UuidPopulator.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/MultiDimensionExpressionUpgrader.java
modified:
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.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
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/UuidPopulator.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/UuidPopulator.java 2011-02-15 06:38:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/UuidPopulator.java 1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-package org.hisp.dhis.dataelement;
-
-/*
- * Copyright (c) 2004-2010, 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 org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.hisp.dhis.system.startup.AbstractStartupRoutine;
-import org.hisp.dhis.system.util.UUIdUtils;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Bob Jolliffe
- * @version $Id$
- *
- * Provides uuids to uniquely indentifiable objects which do not already have them.
- *
- * <p>Should be all the things requiring uuids .. there are more.
- * What follows is a bit of a compromise hack essentially copying
- * and pasting 3 times. Should reimplement with common interface
- * IdentifiableObject or something similar.
- */
-public class UuidPopulator
- extends AbstractStartupRoutine
-{
- private Log log = LogFactory.getLog( UuidPopulator.class );
-
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private DataElementCategoryService categoryService;
-
- private DataElementService dataElementService;
-
- public void setCategoryService( DataElementCategoryService categoryService )
- {
- this.categoryService = categoryService;
- }
-
- public void setDataElementService( DataElementService dataElementService )
- {
- this.dataElementService = dataElementService;
- }
-
- // -------------------------------------------------------------------------
- // StartupRoutine implementation
- // -------------------------------------------------------------------------
-
- @Transactional
- public void execute()
- throws Exception
- {
- for ( DataElementCategoryOption option : categoryService.getAllDataElementCategoryOptions() )
- {
- if ( option.getUuid() == null )
- {
- option.setUuid( UUIdUtils.getUUId() );
- categoryService.updateDataElementCategoryOption( option );
- log.info( "Added uuid for CategoryOption '" + option.getName() + "'" );
-
- }
- }
- log.info( "Checked CategoryOption uuids" );
-
- for ( DataElementCategory category : categoryService.getAllDataElementCategories() )
- {
- if ( category.getUuid() == null )
- {
- category.setUuid( UUIdUtils.getUUId() );
- categoryService.updateDataElementCategory( category );
- log.info( "Added uuid for Category '" + category.getName() + "'" );
-
- }
- }
- log.info( "Checked Category uuids" );
-
- for ( DataElement de : dataElementService.getAllDataElements() )
- {
- if ( de.getUuid() == null )
- {
- de.setUuid( UUIdUtils.getUUId() );
- dataElementService.updateDataElement( de );
- log.info( "Added uuid for DataElement '" + de.getName() + "'" );
-
- }
- }
- log.info( "Checked DataElement uuids" );
-
- for ( DataElementCategoryOptionCombo combo : categoryService.getAllDataElementCategoryOptionCombos() )
- {
- if ( combo.getUuid() == null )
- {
- combo.setUuid( UUIdUtils.getUUId() );
- categoryService.updateDataElementCategoryOptionCombo( combo );
- log.info( "Added uuid for CategoryOptionCombo '" + combo.getName() + "'" );
- }
- }
- log.info( "Checked CategoryOptionCombo uuids" );
-
- }
-}
=== removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/MultiDimensionExpressionUpgrader.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/MultiDimensionExpressionUpgrader.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/expression/MultiDimensionExpressionUpgrader.java 1970-01-01 00:00:00 +0000
@@ -1,175 +0,0 @@
-package org.hisp.dhis.expression;
-
-/*
- * Copyright (c) 2004-2010, 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.expression.Expression.SEPARATOR;
-
-import java.util.Collection;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.dataelement.DataElementCategoryService;
-import org.hisp.dhis.indicator.Indicator;
-import org.hisp.dhis.indicator.IndicatorService;
-import org.hisp.dhis.system.startup.AbstractStartupRoutine;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * @author Abyot Aselefew
- * @version $Id$
- */
-public class MultiDimensionExpressionUpgrader
- extends AbstractStartupRoutine
-{
- // -------------------------------------------------------------------------
- // Dependencies
- // -------------------------------------------------------------------------
-
- private ExpressionService expressionService;
-
- public void setExpressionService( ExpressionService expressionService )
- {
- this.expressionService = expressionService;
- }
-
- private IndicatorService indicatorService;
-
- public void setIndicatorService( IndicatorService indicatorService )
- {
- this.indicatorService = indicatorService;
- }
-
- private DataElementCategoryService categoryService;
-
- public void setCategoryService( DataElementCategoryService categoryService )
- {
- this.categoryService = categoryService;
- }
-
- // -------------------------------------------------------------------------
- // Execute
- // -------------------------------------------------------------------------
-
- @Transactional
- public void execute()
- throws Exception
- {
- DataElementCategoryOptionCombo defaultOptionCombo = categoryService
- .getDefaultDataElementCategoryOptionCombo();
-
- int defaultId = defaultOptionCombo.getId();
-
- Collection<Expression> expressions = expressionService.getAllExpressions();
-
- Collection<Indicator> indicators = indicatorService.getAllIndicators();
-
- // ---------------------------------------------------------------------
- // Any expression containing an operand of the form [dataElementId] will
- // be upgraded to the form [dataElementId.defaultOptionComboId]
- // ---------------------------------------------------------------------
-
- for ( Expression expression : expressions )
- {
- String expressionString = upgradeExpression( expression.getExpression(), defaultId );
-
- if ( expressionString != null )
- {
- expression.setExpression( expressionString );
-
- if ( expression.getDescription() == null )
- {
- expression.setDescription( expressionService.getExpressionDescription( expressionString ) );
- }
-
- expressionService.updateExpression( expression );
- }
- }
-
- for ( Indicator indicator : indicators )
- {
- String numerator = upgradeExpression( indicator.getNumerator(), defaultId );
-
- String denominator = upgradeExpression( indicator.getDenominator(), defaultId );
-
- if ( numerator != null )
- {
- indicator.setNumerator( numerator );
- }
-
- if ( denominator != null )
- {
- indicator.setDenominator( denominator );
- }
-
- if ( numerator != null || denominator != null )
- {
- indicatorService.updateIndicator( indicator );
- }
- }
- }
-
- // -------------------------------------------------------------------------
- // Supportive methods
- // -------------------------------------------------------------------------
-
- private String upgradeExpression( String expression, int defaultOptionComboId )
- {
- StringBuffer buffer = new StringBuffer();
-
- boolean matched = false;
-
- if ( expression != null )
- {
- Matcher matcher = getMatcher( "(\\[\\d+\\])", expression );
-
- while ( matcher.find() )
- {
- matched = true;
-
- String replaceString = matcher.group();
-
- replaceString = replaceString.substring( 0, replaceString.length() - 1 ) + SEPARATOR
- + defaultOptionComboId + "]";
-
- matcher.appendReplacement( buffer, replaceString );
- }
-
- matcher.appendTail( buffer );
- }
-
- return matched ? buffer.toString() : null;
- }
-
- private Matcher getMatcher( String regex, String expression )
- {
- Pattern pattern = Pattern.compile( regex );
-
- return pattern.matcher( expression );
- }
-}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-05-10 20:24:39 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-05-12 12:26:59 +0000
@@ -995,17 +995,6 @@
<property name="runlevel" value="3" />
</bean>
- <bean id="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"
- class="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader">
- <property name="expressionService" ref="org.hisp.dhis.expression.ExpressionService" />
- <property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
- <property name="categoryService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="name" value="MultiDimensionExpressionUpgrader" />
- <property name="runlevel" value="3" />
- <property name="skipInTests" value="true" />
- </bean>
-
<bean id="org.hisp.dhis.startup.TableCreator" class="org.hisp.dhis.startup.TableCreator">
<property name="jdbcTemplate" ref="jdbcTemplate" />
<property name="statementBuilder" ref="statementBuilder" />
@@ -1022,14 +1011,6 @@
<property name="skipInTests" value="true" />
</bean>
- <bean id="org.hisp.dhis.dataelement.UuidPopulator" class="org.hisp.dhis.dataelement.UuidPopulator">
- <property name="categoryService"
- ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
- <property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
- <property name="runlevel" value="5" />
- <property name="skipInTests" value="true" />
- </bean>
-
<bean id="org.hisp.dhis.dataset.DataSetShortNamePopulator" class="org.hisp.dhis.dataset.DataSetShortNamePopulator">
<property name="dataSetService" ref="org.hisp.dhis.dataset.DataSetService" />
<property name="runlevel" value="5" />
@@ -1056,9 +1037,7 @@
<ref local="org.hisp.dhis.period.PeriodTypePopulator" />
<ref local="org.hisp.dhis.startup.TableCreator" />
<ref local="org.hisp.dhis.dataelement.DataElementDefaultDimensionPopulator" />
- <ref local="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader" />
<ref local="org.hisp.dhis.dataset.DataSetShortNamePopulator" />
- <ref local="org.hisp.dhis.dataelement.UuidPopulator" />
<ref local="org.hisp.dhis.organisationunit.OrganisationUnitGroupSetPopulator" />
<ref local="org.hisp.dhis.dataentryform.DataEntryFormPopulator" />
</list>
