dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #02450
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 816: Added startup task to populate missing uuids
------------------------------------------------------------
revno: 816
committer: Bob Jolliffe <bobj@bobj-laptop>
branch nick: trunk
timestamp: Fri 2009-10-02 18:35:53 +0100
message:
Added startup task to populate missing uuids
added:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/UuidPopulator.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.
=== added 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 1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/UuidPopulator.java 2009-10-02 17:35:53 +0000
@@ -0,0 +1,123 @@
+package org.hisp.dhis.dataelement;
+
+/*
+ * Copyright (c) 2004-2007, 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;
+
+/**
+ * @author Bob Jolliffe
+ * @version $Id$
+ *
+ * Provides uuids to uniquely indentifiable objects which do not
+ * already have them.
+ */
+public class UuidPopulator
+ extends AbstractStartupRoutine
+{
+ private Log log = LogFactory.getLog( UuidPopulator.class );
+
+ // -------------------------------------------------------------------------
+ // Dependencies
+ // -------------------------------------------------------------------------
+
+ // 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.
+
+ private DataElementCategoryOptionService categoryOptionService;
+ private DataElementCategoryService categoryService;
+ private DataElementService dataElementService;
+
+ public void setCategoryOptionService( DataElementCategoryOptionService categoryOptionService )
+ {
+ this.categoryOptionService = categoryOptionService;
+ }
+
+ public void setCategoryService( DataElementCategoryService categoryService )
+ {
+ this.categoryService = categoryService;
+ }
+
+ public void setDataElementService( DataElementService dataElementService )
+ {
+ this.dataElementService = dataElementService;
+ }
+
+ // -------------------------------------------------------------------------
+ // StartupRoutine implementation
+ // -------------------------------------------------------------------------
+
+ public void execute()
+ throws Exception
+ {
+ for ( DataElementCategoryOption option : categoryOptionService.getAllDataElementCategoryOptions() )
+ {
+ if ( option.getUuid() == null )
+ {
+ option.setUuid( UUIdUtils.getUUId() );
+ categoryOptionService.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" );
+
+ }
+
+}
+
+
=== 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 2009-09-25 21:45:01 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2009-10-02 17:35:53 +0000
@@ -333,6 +333,17 @@
<property name="skipInTests" value="true"/>
</bean>
+ <bean id="org.hisp.dhis.dataelement.UuidPopulator"
+ class="org.hisp.dhis.dataelement.UuidPopulator">
+ <property name="categoryOptionService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryOptionService"/>
+ <property name="categoryService"
+ ref="org.hisp.dhis.dataelement.DataElementCategoryService"/>
+ <property name="dataElementService"
+ ref="org.hisp.dhis.dataelement.DataElementService"/>
+ <property name="skipInTests" value="true"/>
+ </bean>
+
<bean class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
<property name="targetObject"
ref="org.hisp.dhis.system.startup.StartupRoutineExecutor"/>
@@ -345,6 +356,7 @@
<ref local="org.hisp.dhis.expression.MultiDimensionExpressionUpgrader"/>
<ref local="org.hisp.dhis.dataset.DataSetShortNamePopulator"/>
<ref local="org.hisp.dhis.dataelement.CategoryOptionShortNamePopulator"/>
+ <ref local="org.hisp.dhis.dataelement.UuidPopulator"/>
</list>
</list>
</property>