=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractIdentifiableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractIdentifiableObject.java 2011-11-22 12:27:29 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractIdentifiableObject.java 2011-11-22 15:48:30 +0000 @@ -31,7 +31,6 @@ import java.util.Date; import java.util.HashMap; import java.util.Map; -import java.util.UUID; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -57,11 +56,6 @@ protected int id; /** - * The Universally Unique Identifer for this Object. - */ - protected String uuid; - - /** * The Unique Identifer for this Object. */ protected String uid; @@ -85,10 +79,10 @@ { } - public AbstractIdentifiableObject( int id, String uuid, String name ) + public AbstractIdentifiableObject( int id, String uid, String name ) { this.id = id; - this.uuid = uuid; + this.uid = uid; this.name = name; } @@ -104,17 +98,6 @@ this.id = id; } - @Override - public String getUuid() - { - return uuid; - } - - public void setUuid( String uuid ) - { - this.uuid = uuid; - } - @XmlAttribute @Override public String getUid() @@ -172,35 +155,10 @@ setUid( CodeGenerator.generateCode() ); } - if ( uuid == null ) - { - setUuid( UUID.randomUUID().toString().toUpperCase() ); - } - setLastUpdated( new Date() ); } /** - * Get a map of uuids to internal identifiers - * - * @param objects the IdentifiableObjects to put in the map - * @return the map - */ - public static Map getUUIDMap( Collection objects ) - { - Map map = new HashMap(); - for ( IdentifiableObject object : objects ) - { - String uuid = object.getUuid(); - int internalId = object.getId(); - - map.put( uuid, internalId ); - } - - return map; - } - - /** * Get a map of uids to internal identifiers * * @param objects the IdentifiableObjects to put in the map === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractNameableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractNameableObject.java 2011-11-04 09:34:37 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/AbstractNameableObject.java 2011-11-22 15:48:30 +0000 @@ -57,10 +57,10 @@ { } - public AbstractNameableObject( int id, String uuid, String name, String alternativeName, String shortName, + public AbstractNameableObject( int id, String uid, String name, String alternativeName, String shortName, String code, String description ) { - super( id, uuid, name ); + super( id, uid, name ); this.alternativeName = alternativeName; this.shortName = shortName; this.code = code; === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java 2011-11-03 01:02:13 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/GenericIdentifiableObjectStore.java 2011-11-22 15:48:30 +0000 @@ -37,18 +37,10 @@ extends GenericStore { /** - * Retrieves the object with the given uuid. - * - * @param uuid the uuid. - * @return the object with the given uuid. - */ - T getByUuid( String uuid ); - - /** * Retrieves the object with the given uid. * - * @param uuid the uuid. - * @return the object with the given uuid. + * @param uid the uid. + * @return the object with the given uid. */ T getByUid( String uid ); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java 2011-11-03 01:02:13 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java 2011-11-22 15:48:30 +0000 @@ -35,8 +35,6 @@ { public abstract int getId(); - public abstract String getUuid(); - public abstract String getUid(); public abstract String getName(); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2011-10-12 22:13:19 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2011-11-22 15:48:30 +0000 @@ -244,15 +244,20 @@ void deleteDataElementCategoryOptionCombo( DataElementCategoryOptionCombo dataElementCategoryOptionCombo ); /** - * Retrieves a DataElementCategoryOptionCombo with the given identifier. + * Retrieves the DataElementCategoryOptionCombo with the given identifier. * * @param id the identifier of the DataElementCategoryOptionCombo. * @return the DataElementCategoryOptionCombo. */ DataElementCategoryOptionCombo getDataElementCategoryOptionCombo( int id ); - DataElementCategoryOptionCombo getDataElementCategoryOptionCombo( String uuid ); - + /** + * Retrieves the DataElementCategoryOptionCombo with the given uid. + * + * @param uid the uid of the DataElementCategoryOptionCombo. + * @return the DataElementCategoryOptionCombo. + */ + DataElementCategoryOptionCombo getDataElementCategoryOptionCombo( String uid ); /** * Retrieves the DataElementCategoryOptionCombos with the given identifiers. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java 2011-11-11 20:29:33 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java 2011-11-22 15:48:30 +0000 @@ -85,12 +85,12 @@ DataElement getDataElement( int id ); /** - * Returns the DataElement with the given UUID. + * Returns the DataElement with the given UID. * - * @param uuid the UUID. - * @return the DataElement with the given UUID, or null if no match. + * @param uid the UID. + * @return the DataElement with the given UID, or null if no match. */ - DataElement getDataElement( String uuid ); + DataElement getDataElement( String uid ); /** * Returns the DataElement with the given code. @@ -335,12 +335,12 @@ Collection getDataElementGroups( Collection identifiers ); /** - * Returns the DataElementGroup with the given UUID. + * Returns the DataElementGroup with the given UID. * - * @param id the UUID of the DataElementGroup to return. - * @return the DataElementGroup with the given UUID, or null if no match. + * @param id the UID of the DataElementGroup to return. + * @return the DataElementGroup with the given UID, or null if no match. */ - DataElementGroup getDataElementGroup( String uuid ); + DataElementGroup getDataElementGroup( String uid ); /** * Returns a DataElementGroup with a given name. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java 2011-11-11 20:29:33 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java 2011-11-22 15:48:30 +0000 @@ -31,8 +31,8 @@ import java.util.Map; import java.util.Set; +import org.hisp.dhis.common.GenericNameableObjectStore; import org.hisp.dhis.dataset.DataSet; -import org.hisp.dhis.hierarchy.HierarchyViolationException; /** * Defines the functionality for persisting DataElements and DataElementGroups. @@ -41,6 +41,7 @@ * @version $Id: DataElementStore.java 6289 2008-11-14 17:53:24Z larshelg $ */ public interface DataElementStore + extends GenericNameableObjectStore { String ID = DataElementStore.class.getName(); @@ -49,64 +50,6 @@ // ------------------------------------------------------------------------- /** - * Adds a DataElement. - * - * @param dataElement the DataElement to add. - * @return a generated unique id of the added DataElement. - */ - int addDataElement( DataElement dataElement ); - - /** - * Updates a DataElement. - * - * @param dataElement the DataElement to update. - */ - void updateDataElement( DataElement dataElement ); - - /** - * Deletes a DataElement. The DataElement is also removed from any - * DataElementGroups it is a member of. It is not possible to delete a - * DataElement with children. - * - * @param dataElement the DataElement to delete. - * @throws HierarchyViolationException if the DataElement has children. - */ - void deleteDataElement( DataElement dataElement ) - throws HierarchyViolationException; - - /** - * Returns a DataElement. - * - * @param id the id of the DataElement to return. - * @return the DataElement with the given id, or null if no match. - */ - DataElement getDataElement( int id ); - - /** - * Returns the DataElement with the given UUID. - * - * @param uuid the UUID. - * @return the DataElement with the given UUID, or null if no match. - */ - DataElement getDataElement( String uuid ); - - /** - * Returns the DataElement with the given code. - * - * @param code the code. - * @return the DataElement with the given code, or null if no match. - */ - DataElement getDataElementByCode( String code ); - - /** - * Returns a DataElement with a given name. - * - * @param name the name of the DataElement to return. - * @return the DataElement with the given name, or null if no match. - */ - DataElement getDataElementByName( String name ); - - /** * Returns List of DataElements with a given key. * * @param key the name of the DataElement to return. @@ -115,31 +58,6 @@ Collection searchDataElementsByName( String key ); /** - * Returns a DataElement with a given alternative name. - * - * @param alternativeName the alternative name of the DataElement to return. - * @return the DataElement with the given alternative name, or null if no - * match. - */ - DataElement getDataElementByAlternativeName( String alternativeName ); - - /** - * Returns a DataElement with a given short name. - * - * @param shortName the short name of the DataElement to return. - * @return the DataElement with the given short name, or null if no match. - */ - DataElement getDataElementByShortName( String shortName ); - - /** - * Returns all DataElements. - * - * @return a collection of all DataElements, or an empty collection if there - * are no DataElements. - */ - Collection getAllDataElements(); - - /** * Returns all DataElements with types that are possible to aggregate. The * types are currently INT and BOOL. * === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2011-09-27 10:12:47 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2011-11-22 15:48:30 +0000 @@ -77,12 +77,12 @@ DataSet getDataSet( int id ); /** - * Returns the DataSet with the given UUID. + * Returns the DataSet with the given UID. * - * @param uuid the UUID. - * @return the DataSet with the given UUID, or null if no match. + * @param uid the UID. + * @return the DataSet with the given UID, or null if no match. */ - DataSet getDataSet( String uuid ); + DataSet getDataSet( String uid ); /** * Returns a DataSets with the given name. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java 2011-09-27 10:12:47 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetStore.java 2011-11-22 15:48:30 +0000 @@ -75,12 +75,12 @@ DataSet getDataSet( int id ); /** - * Returns the DataSet with the given UUID. + * Returns the DataSet with the given UID. * - * @param uuid the UUID. - * @return the DataSet with the given UUID, or null if no match. + * @param uid the UID. + * @return the DataSet with the given UID, or null if no match. */ - DataSet getDataSet( String uuid ); + DataSet getDataSet( String uid ); /** === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java 2011-10-05 10:06:16 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorService.java 2011-11-22 15:48:30 +0000 @@ -49,7 +49,7 @@ Indicator getIndicator( int id ); - Indicator getIndicator( String uuid ); + Indicator getIndicator( String uid ); Collection getAllIndicators(); @@ -119,7 +119,7 @@ Collection getIndicatorGroups( Collection identifiers ); - IndicatorGroup getIndicatorGroup( String uuid ); + IndicatorGroup getIndicatorGroup( String uid ); Collection getAllIndicatorGroups(); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java 2011-10-03 15:14:41 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/indicator/IndicatorStore.java 2011-11-22 15:48:30 +0000 @@ -45,7 +45,7 @@ Indicator getIndicator( int id ); - Indicator getIndicator( String uuid ); + Indicator getIndicator( String uid ); Collection getAllIndicators(); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java 2011-05-22 12:19:06 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java 2011-11-22 15:48:30 +0000 @@ -82,12 +82,12 @@ Collection getOrganisationUnitGroups( Collection identifiers ); /** - * Returns the OrganisationUnitGroup with the given UUID. + * Returns the OrganisationUnitGroup with the given UID. * - * @param id the UUID of the OrganisationUnitGroup. - * @return the OrganisationGroup with the given UUID, or null if no match. + * @param uid the UID of the OrganisationUnitGroup. + * @return the OrganisationGroup with the given UID, or null if no match. */ - OrganisationUnitGroup getOrganisationUnitGroup( String uuid ); + OrganisationUnitGroup getOrganisationUnitGroup( String uid ); /** * Returns an OrganisationUnitGroup with a given name. === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2011-10-08 13:09:04 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2011-11-22 15:48:30 +0000 @@ -93,12 +93,12 @@ OrganisationUnit getOrganisationUnit( int id ); /** - * Returns the OrganisationUnit with the given UUID. + * Returns the OrganisationUnit with the given UID. * - * @param uuid the UUID of the OrganisationUnit to return. - * @return the OrganisationUnit with the given UUID, or null if no match. + * @param uid the UID of the OrganisationUnit to return. + * @return the OrganisationUnit with the given UID, or null if no match. */ - OrganisationUnit getOrganisationUnit( String uuid ); + OrganisationUnit getOrganisationUnit( String uid ); /** * Returns the OrganisationUnit with the given code. === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2011-11-04 09:28:14 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2011-11-22 15:48:30 +0000 @@ -257,8 +257,8 @@ return dataElementCategoryOptionComboStore.get( id ); } - public DataElementCategoryOptionCombo getDataElementCategoryOptionCombo( String uuid ) { - return dataElementCategoryOptionComboStore.getByUuid( uuid ); + public DataElementCategoryOptionCombo getDataElementCategoryOptionCombo( String uid ) { + return dataElementCategoryOptionComboStore.getByUid( uid ); } public Collection getDataElementCategoryOptionCombos( === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java 2011-11-11 20:29:33 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java 2011-11-22 15:48:30 +0000 @@ -48,7 +48,6 @@ import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.system.util.Filter; import org.hisp.dhis.system.util.FilterUtils; -import org.hisp.dhis.system.util.UUIdUtils; import org.springframework.transaction.annotation.Transactional; /** @@ -101,7 +100,7 @@ { dataElement.setLastUpdated( new Date() ); - int id = dataElementStore.addDataElement( dataElement ); + int id = dataElementStore.save( dataElement ); i18nService.addObject( dataElement ); @@ -112,7 +111,7 @@ { dataElement.setLastUpdated( new Date() ); - dataElementStore.updateDataElement( dataElement ); + dataElementStore.update( dataElement ); i18nService.verify( dataElement ); } @@ -122,27 +121,27 @@ { i18nService.removeObject( dataElement ); - dataElementStore.deleteDataElement( dataElement ); + dataElementStore.delete( dataElement ); } public DataElement getDataElement( int id ) { - return i18n( i18nService, dataElementStore.getDataElement( id ) ); + return i18n( i18nService, dataElementStore.get( id ) ); } public DataElement getDataElement( String uuid ) { - return i18n( i18nService, dataElementStore.getDataElement( uuid ) ); + return i18n( i18nService, dataElementStore.getByUid( uuid ) ); } public DataElement getDataElementByCode( String code ) { - return i18n( i18nService, dataElementStore.getDataElementByCode( code ) ); + return i18n( i18nService, dataElementStore.getByCode( code ) ); } public Collection getAllDataElements() { - return i18n( i18nService, dataElementStore.getAllDataElements() ); + return i18n( i18nService, dataElementStore.getAll() ); } public Collection getDataElements( final Collection identifiers ) @@ -199,7 +198,7 @@ public DataElement getDataElementByName( String name ) { - return i18n( i18nService, dataElementStore.getDataElementByName( name ) ); + return i18n( i18nService, dataElementStore.getByName( name ) ); } public Collection searchDataElementsByName( String key ) @@ -209,12 +208,12 @@ public DataElement getDataElementByAlternativeName( String alternativeName ) { - return i18n( i18nService, dataElementStore.getDataElementByAlternativeName( alternativeName ) ); + return i18n( i18nService, dataElementStore.getByAlternativeName( alternativeName ) ); } public DataElement getDataElementByShortName( String shortName ) { - return i18n( i18nService, dataElementStore.getDataElementByShortName( shortName ) ); + return i18n( i18nService, dataElementStore.getByShortName( shortName ) ); } public Collection getDataElementsByAggregationOperator( String aggregationOperator ) @@ -360,11 +359,6 @@ public int addDataElementGroup( DataElementGroup dataElementGroup ) { - if ( dataElementGroup.getUuid() == null ) - { - dataElementGroup.setUuid( UUIdUtils.getUUId() ); - } - int id = dataElementGroupStore.save( dataElementGroup ); i18nService.addObject( dataElementGroup ); @@ -404,9 +398,9 @@ } ); } - public DataElementGroup getDataElementGroup( String uuid ) + public DataElementGroup getDataElementGroup( String uid ) { - return i18n( i18nService, dataElementGroupStore.getByUuid( uuid ) ); + return i18n( i18nService, dataElementGroupStore.getByUid( uid ) ); } public Collection getAllDataElementGroups() === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2011-11-11 20:29:33 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2011-11-22 15:48:30 +0000 @@ -41,13 +41,12 @@ import org.hibernate.Query; import org.hibernate.Session; import org.hibernate.criterion.Restrictions; -import org.hisp.dhis.common.hibernate.HibernateIdentifiableObjectStore; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryCombo; import org.hisp.dhis.dataelement.DataElementOperand; import org.hisp.dhis.dataelement.DataElementStore; import org.hisp.dhis.dataset.DataSet; -import org.hisp.dhis.hierarchy.HierarchyViolationException; +import org.hisp.dhis.hibernate.HibernateGenericStore; import org.hisp.dhis.system.objectmapper.DataElementOperandMapper; import org.hisp.dhis.system.util.ConversionUtils; import org.hisp.dhis.system.util.TextUtils; @@ -59,7 +58,7 @@ * larshelg $ */ public class HibernateDataElementStore - extends HibernateIdentifiableObjectStore + extends HibernateGenericStore implements DataElementStore { // ------------------------------------------------------------------------- @@ -77,63 +76,6 @@ // DataElement // ------------------------------------------------------------------------- - @Override - public int addDataElement( DataElement dataElement ) - { - return this.save( dataElement ); - } - - @Override - public void updateDataElement( DataElement dataElement ) - { - this.update( dataElement ); - } - - public void deleteDataElement( DataElement dataElement ) - throws HierarchyViolationException - { - Session session = sessionFactory.getCurrentSession(); - - session.delete( dataElement ); - } - - public DataElement getDataElement( int id ) - { - Session session = sessionFactory.getCurrentSession(); - - return (DataElement) session.get( DataElement.class, id ); - } - - public DataElement getDataElement( String uuid ) - { - Session session = sessionFactory.getCurrentSession(); - - Criteria criteria = session.createCriteria( DataElement.class ); - criteria.add( Restrictions.eq( "uuid", uuid ) ); - - return (DataElement) criteria.uniqueResult(); - } - - public DataElement getDataElementByCode( String code ) - { - Session session = sessionFactory.getCurrentSession(); - - Criteria criteria = session.createCriteria( DataElement.class ); - criteria.add( Restrictions.eq( "code", code ) ); - - return (DataElement) criteria.uniqueResult(); - } - - public DataElement getDataElementByName( String name ) - { - Session session = sessionFactory.getCurrentSession(); - - Criteria criteria = session.createCriteria( DataElement.class ); - criteria.add( Restrictions.eq( "name", name ) ); - - return (DataElement) criteria.uniqueResult(); - } - @SuppressWarnings( "unchecked" ) public Collection searchDataElementsByName( String key ) { @@ -145,31 +87,6 @@ return criteria.list(); } - public DataElement getDataElementByAlternativeName( String alternativeName ) - { - Session session = sessionFactory.getCurrentSession(); - - Criteria criteria = session.createCriteria( DataElement.class ); - criteria.add( Restrictions.eq( "alternativeName", alternativeName ) ); - - return (DataElement) criteria.uniqueResult(); - } - - public DataElement getDataElementByShortName( String shortName ) - { - Session session = sessionFactory.getCurrentSession(); - - Criteria criteria = session.createCriteria( DataElement.class ); - criteria.add( Restrictions.eq( "shortName", shortName ) ); - - return (DataElement) criteria.uniqueResult(); - } - - public Collection getAllDataElements() - { - return getAll(); - } - @SuppressWarnings( "unchecked" ) public Collection getAggregateableDataElements() { === removed file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetShortNamePopulator.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetShortNamePopulator.java 2011-02-15 06:36:28 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DataSetShortNamePopulator.java 1970-01-01 00:00:00 +0000 @@ -1,112 +0,0 @@ -package org.hisp.dhis.dataset; - -/* - * 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 java.util.Random; - -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.TextUtils; -import org.hisp.dhis.system.util.UUIdUtils; - -/** - * @author Lars Helge Overland - * @version $Id$ - */ -public class DataSetShortNamePopulator - extends AbstractStartupRoutine -{ - private Log log = LogFactory.getLog( DataSetShortNamePopulator.class ); - - // ------------------------------------------------------------------------- - // Dependencies - // ------------------------------------------------------------------------- - - private DataSetService dataSetService; - - public void setDataSetService( DataSetService dataSetService ) - { - this.dataSetService = dataSetService; - } - - // ------------------------------------------------------------------------- - // StartupRoutine implementation - // ------------------------------------------------------------------------- - - public void execute() - throws Exception - { - - for ( DataSet dataSet : dataSetService.getAllDataSets() ) - { - boolean changed = false; - Random random = new Random(); - - if ( dataSet.getShortName() == null || dataSet.getShortName().trim().length() == 0 ) - { - String shortName = TextUtils.subString( dataSet.getName(), 0, 40 ); - shortName = dataSet.getName().length() > 40 ? shortName + (random.nextInt( 900 ) + 100) : shortName; - dataSet.setShortName( shortName ); - changed = true; - } - - if ( dataSet.getCode() == null || dataSet.getCode().trim().length() == 0 ) - { - String code = TextUtils.subString( dataSet.getName(), 0, 40 ); - code = dataSet.getName().length() > 40 ? code + (random.nextInt( 900 ) + 100) : code; - dataSet.setCode( code ); - changed = true; - } - - if ( dataSet.getUuid() == null ) - { - dataSet.setUuid( UUIdUtils.getUUId() ); - log.info( "Adding uuid to dataset '" + dataSet.getName() + "'"); - changed = true; - } - - if ( changed ) - { - try - { - dataSetService.updateDataSet( dataSet ); - } - catch ( Exception ex ) - { - log.warn( "Could not set short name, code or uuid of DataSet: '" + dataSet.getName() - + "', please do it manually" ); - } - } - } - - log.info( "Populated DataSet short name, code and uuid" ); - - } - -} === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2011-11-09 07:51:55 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2011-11-22 15:48:30 +0000 @@ -46,7 +46,6 @@ import org.hisp.dhis.system.util.AuditLogUtil; import org.hisp.dhis.system.util.Filter; import org.hisp.dhis.system.util.FilterUtils; -import org.hisp.dhis.system.util.UUIdUtils; import org.hisp.dhis.user.CurrentUserService; import org.springframework.transaction.annotation.Transactional; @@ -91,11 +90,6 @@ public int addDataSet( DataSet dataSet ) { - if ( dataSet.getUuid() == null ) - { - dataSet.setUuid( UUIdUtils.getUUId() ); - } - int id = dataSetStore.addDataSet( dataSet ); i18nService.addObject( dataSet ); @@ -132,9 +126,9 @@ } @Override - public DataSet getDataSet( String uuid ) + public DataSet getDataSet( String uid ) { - return i18n( i18nService, dataSetStore.getDataSet( uuid ) ); + return i18n( i18nService, dataSetStore.getDataSet( uid ) ); } public DataSet getDataSetByName( String name ) === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java 2011-10-05 10:06:16 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/indicator/DefaultIndicatorService.java 2011-11-22 15:48:30 +0000 @@ -38,7 +38,6 @@ import org.hisp.dhis.i18n.I18nService; import org.hisp.dhis.system.util.Filter; import org.hisp.dhis.system.util.FilterUtils; -import org.hisp.dhis.system.util.UUIdUtils; import org.springframework.transaction.annotation.Transactional; /** @@ -94,11 +93,6 @@ public int addIndicator( Indicator indicator ) { - if ( indicator.getUuid() == null ) - { - indicator.setUuid( UUIdUtils.getUUId() ); - } - indicator.setLastUpdated( new Date() ); int id = indicatorStore.addIndicator( indicator ); @@ -293,11 +287,6 @@ public int addIndicatorGroup( IndicatorGroup indicatorGroup ) { - if ( indicatorGroup.getUuid() == null ) - { - indicatorGroup.setUuid( UUIdUtils.getUUId() ); - } - int id = indicatorGroupStore.save( indicatorGroup ); i18nService.addObject( indicatorGroup ); @@ -337,9 +326,9 @@ } ); } - public IndicatorGroup getIndicatorGroup( String uuid ) + public IndicatorGroup getIndicatorGroup( String uid ) { - return i18n( i18nService, indicatorGroupStore.getByUuid( uuid ) ); + return i18n( i18nService, indicatorGroupStore.getByUid( uid ) ); } public Collection getAllIndicatorGroups() @@ -509,5 +498,4 @@ { return i18n( i18nService, indicatorGroupSetStore.getBetweenByName( name, first, max ) ); } - } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java 2011-11-03 14:27:18 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java 2011-11-22 15:48:30 +0000 @@ -98,9 +98,9 @@ } ); } - public OrganisationUnitGroup getOrganisationUnitGroup( String uuid ) + public OrganisationUnitGroup getOrganisationUnitGroup( String uid ) { - return organisationUnitGroupStore.getByUuid( uuid ); + return organisationUnitGroupStore.getByUid( uid ); } public OrganisationUnitGroup getOrganisationUnitGroupByName( String name ) === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2011-11-09 07:51:55 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2011-11-22 15:48:30 +0000 @@ -185,9 +185,9 @@ } ); } - public OrganisationUnit getOrganisationUnit( String uuid ) + public OrganisationUnit getOrganisationUnit( String uid ) { - return organisationUnitStore.getByUuid( uuid ); + return organisationUnitStore.getByUid( uid ); } public OrganisationUnit getOrganisationUnitByName( String name ) === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-11-12 18:43:35 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java 2011-11-22 15:48:30 +0000 @@ -292,6 +292,33 @@ executeSql( "ALTER TABLE indicator ADD CONSTRAINT indicator_code_key UNIQUE(code)" ); executeSql( "ALTER TABLE organisationunit ADD CONSTRAINT organisationunit_code_key UNIQUE(code)" ); + // remove uuid + + executeSql( "ALTER TABLE attribute DROP COLUMN uuid" ); + executeSql( "ALTER TABLE categorycombo DROP COLUMN uuid" ); + executeSql( "ALTER TABLE categoryoptioncombo DROP COLUMN uuid" ); + executeSql( "ALTER TABLE chart DROP COLUMN uuid" ); + executeSql( "ALTER TABLE concept DROP COLUMN uuid" ); + executeSql( "ALTER TABLE constant DROP COLUMN uuid" ); + executeSql( "ALTER TABLE datadictionary DROP COLUMN uuid" ); + executeSql( "ALTER TABLE dataelement DROP COLUMN uuid" ); + executeSql( "ALTER TABLE dataelementcategory DROP COLUMN uuid" ); + executeSql( "ALTER TABLE dataelementcategoryoption DROP COLUMN uuid" ); + executeSql( "ALTER TABLE dataelementgroup DROP COLUMN uuid" ); + executeSql( "ALTER TABLE dataelementgroupset DROP COLUMN uuid" ); + executeSql( "ALTER TABLE dataset DROP COLUMN uuid" ); + executeSql( "ALTER TABLE indicator DROP COLUMN uuid" ); + executeSql( "ALTER TABLE indicatorgroup DROP COLUMN uuid" ); + executeSql( "ALTER TABLE indicatorgroupset DROP COLUMN uuid" ); + executeSql( "ALTER TABLE indicatortype DROP COLUMN uuid" ); + executeSql( "ALTER TABLE organisationunit DROP COLUMN uuid" ); + executeSql( "ALTER TABLE orgunitgroup DROP COLUMN uuid" ); + executeSql( "ALTER TABLE orgunitgroupset DROP COLUMN uuid" ); + executeSql( "ALTER TABLE orgunitlevel DROP COLUMN uuid" ); + executeSql( "ALTER TABLE report DROP COLUMN uuid" ); + executeSql( "ALTER TABLE validationrule DROP COLUMN uuid" ); + executeSql( "ALTER TABLE validationrulegroup DROP COLUMN uuid" ); + log.info( "Tables updated" ); } === 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-11-11 20:29:33 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml 2011-11-22 15:48:30 +0000 @@ -1081,12 +1081,6 @@ - - - - - - @@ -1111,7 +1105,6 @@ - === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/common/identifiableProperties.hbm' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/common/identifiableProperties.hbm 2011-11-03 01:02:13 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/common/identifiableProperties.hbm 2011-11-22 15:48:30 +0000 @@ -1,5 +1,4 @@ - \ No newline at end of file === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml' --- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml 2011-11-03 10:11:33 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/dataelement/hibernate/DataElementCategoryOptionCombo.hbm.xml 2011-11-22 15:48:30 +0000 @@ -12,8 +12,6 @@ - - === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementGroupStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementGroupStoreTest.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementGroupStoreTest.java 2011-11-22 15:48:30 +0000 @@ -37,7 +37,6 @@ import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.common.GenericIdentifiableObjectStore; -import org.hisp.dhis.system.util.UUIdUtils; import org.junit.Test; /** @@ -174,22 +173,6 @@ } @Test - public void testgetByUUID() - { - String uuid = UUIdUtils.getUUId(); - - DataElementGroup groupA = new DataElementGroup( "groupA" ); - groupA.setUuid( uuid ); - - dataElementGroupStore.save( groupA ); - - groupA = dataElementGroupStore.getByUuid( uuid ); - - assertNotNull( groupA ); - assertEquals( groupA.getUuid(), uuid ); - } - - @Test public void testgetByName() { DataElementGroup dataElementGroupA = new DataElementGroup( "DataElementGroupA" ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java 2011-10-03 14:50:57 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java 2011-11-22 15:48:30 +0000 @@ -158,21 +158,6 @@ } @Test - public void testGetDataElementByUUID() - throws Exception - { - DataElement dataElementA = createDataElement( 'A' ); - int idA = dataElementService.addDataElement( dataElementA ); - - dataElementA = dataElementService.getDataElement( idA ); - String uuid = dataElementA.getUuid(); - - DataElement dataElementB = dataElementService.getDataElement( uuid ); - - assertEquals( dataElementA, dataElementB ); - } - - @Test public void testGetDataElementByCode() throws Exception { @@ -553,21 +538,6 @@ } @Test - public void testGetDataElementGroupByUUID() - throws Exception - { - DataElementGroup groupA = new DataElementGroup( "groupA" ); - int idA = dataElementService.addDataElementGroup( groupA ); - - groupA = dataElementService.getDataElementGroup( idA ); - String uuid = groupA.getUuid(); - - DataElementGroup groupB = dataElementService.getDataElementGroup( uuid ); - - assertEquals( groupA, groupB ); - } - - @Test public void testGetDataElementGroupByName() throws Exception { === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2011-04-24 15:50:02 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2011-11-22 15:48:30 +0000 @@ -42,7 +42,6 @@ import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.period.MonthlyPeriodType; -import org.hisp.dhis.system.util.UUIdUtils; import org.junit.Test; /** @@ -83,14 +82,14 @@ DataElement dataElementC = createDataElement( 'C' ); DataElement dataElementD = createDataElement( 'A' ); - int idA = dataElementStore.addDataElement( dataElementA ); - int idB = dataElementStore.addDataElement( dataElementB ); - int idC = dataElementStore.addDataElement( dataElementC ); + int idA = dataElementStore.save( dataElementA ); + int idB = dataElementStore.save( dataElementB ); + int idC = dataElementStore.save( dataElementC ); try { // Should give unique constraint violation - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementD ); fail(); } catch ( Exception e ) @@ -98,17 +97,17 @@ // Expected } - dataElementA = dataElementStore.getDataElement( idA ); + dataElementA = dataElementStore.get( idA ); assertNotNull( dataElementA ); assertEquals( idA, dataElementA.getId() ); assertEquals( "DataElementA", dataElementA.getName() ); - dataElementB = dataElementStore.getDataElement( idB ); + dataElementB = dataElementStore.get( idB ); assertNotNull( dataElementB ); assertEquals( idB, dataElementB.getId() ); assertEquals( "DataElementB", dataElementB.getName() ); - dataElementC = dataElementStore.getDataElement( idC ); + dataElementC = dataElementStore.get( idC ); assertNotNull( dataElementC ); assertEquals( idC, dataElementC.getId() ); assertEquals( "DataElementC", dataElementC.getName() ); @@ -118,13 +117,13 @@ public void testUpdateDataElement() { DataElement dataElementA = createDataElement( 'A' ); - int idA = dataElementStore.addDataElement( dataElementA ); - dataElementA = dataElementStore.getDataElement( idA ); + int idA = dataElementStore.save( dataElementA ); + dataElementA = dataElementStore.get( idA ); assertEquals( DataElement.VALUE_TYPE_INT, dataElementA.getType() ); dataElementA.setType( DataElement.VALUE_TYPE_BOOL ); - dataElementStore.updateDataElement( dataElementA ); - dataElementA = dataElementStore.getDataElement( idA ); + dataElementStore.update( dataElementA ); + dataElementA = dataElementStore.get( idA ); assertNotNull( dataElementA.getType() ); assertEquals( DataElement.VALUE_TYPE_BOOL, dataElementA.getType() ); } @@ -138,60 +137,44 @@ DataElement dataElementC = createDataElement( 'C' ); DataElement dataElementD = createDataElement( 'D' ); - int idA = dataElementStore.addDataElement( dataElementA ); - int idB = dataElementStore.addDataElement( dataElementB ); - int idC = dataElementStore.addDataElement( dataElementC ); - int idD = dataElementStore.addDataElement( dataElementD ); - - assertNotNull( dataElementStore.getDataElement( idA ) ); - assertNotNull( dataElementStore.getDataElement( idB ) ); - assertNotNull( dataElementStore.getDataElement( idC ) ); - assertNotNull( dataElementStore.getDataElement( idD ) ); - - dataElementA = dataElementStore.getDataElement( idA ); - dataElementB = dataElementStore.getDataElement( idB ); - dataElementC = dataElementStore.getDataElement( idC ); - dataElementD = dataElementStore.getDataElement( idD ); - - dataElementStore.deleteDataElement( dataElementA ); - assertNull( dataElementStore.getDataElement( idA ) ); - assertNotNull( dataElementStore.getDataElement( idB ) ); - assertNotNull( dataElementStore.getDataElement( idC ) ); - assertNotNull( dataElementStore.getDataElement( idD ) ); - - dataElementStore.deleteDataElement( dataElementB ); - assertNull( dataElementStore.getDataElement( idA ) ); - assertNull( dataElementStore.getDataElement( idB ) ); - assertNotNull( dataElementStore.getDataElement( idC ) ); - assertNotNull( dataElementStore.getDataElement( idD ) ); - - dataElementStore.deleteDataElement( dataElementC ); - assertNull( dataElementStore.getDataElement( idA ) ); - assertNull( dataElementStore.getDataElement( idB ) ); - assertNull( dataElementStore.getDataElement( idC ) ); - assertNotNull( dataElementStore.getDataElement( idD ) ); - - dataElementStore.deleteDataElement( dataElementD ); - assertNull( dataElementStore.getDataElement( idA ) ); - assertNull( dataElementStore.getDataElement( idB ) ); - assertNull( dataElementStore.getDataElement( idC ) ); - assertNull( dataElementStore.getDataElement( idD ) ); - } - - @Test - public void testGetDataElementByUUID() - { - String uuid = UUIdUtils.getUUId(); - - DataElement dataElementA = createDataElement( 'A' ); - dataElementA.setUuid( uuid ); - - dataElementStore.addDataElement( dataElementA ); - - dataElementA = dataElementStore.getDataElement( uuid ); - - assertNotNull( dataElementA ); - assertEquals( dataElementA.getUuid(), uuid ); + int idA = dataElementStore.save( dataElementA ); + int idB = dataElementStore.save( dataElementB ); + int idC = dataElementStore.save( dataElementC ); + int idD = dataElementStore.save( dataElementD ); + + assertNotNull( dataElementStore.get( idA ) ); + assertNotNull( dataElementStore.get( idB ) ); + assertNotNull( dataElementStore.get( idC ) ); + assertNotNull( dataElementStore.get( idD ) ); + + dataElementA = dataElementStore.get( idA ); + dataElementB = dataElementStore.get( idB ); + dataElementC = dataElementStore.get( idC ); + dataElementD = dataElementStore.get( idD ); + + dataElementStore.delete( dataElementA ); + assertNull( dataElementStore.get( idA ) ); + assertNotNull( dataElementStore.get( idB ) ); + assertNotNull( dataElementStore.get( idC ) ); + assertNotNull( dataElementStore.get( idD ) ); + + dataElementStore.delete( dataElementB ); + assertNull( dataElementStore.get( idA ) ); + assertNull( dataElementStore.get( idB ) ); + assertNotNull( dataElementStore.get( idC ) ); + assertNotNull( dataElementStore.get( idD ) ); + + dataElementStore.delete( dataElementC ); + assertNull( dataElementStore.get( idA ) ); + assertNull( dataElementStore.get( idB ) ); + assertNull( dataElementStore.get( idC ) ); + assertNotNull( dataElementStore.get( idD ) ); + + dataElementStore.delete( dataElementD ); + assertNull( dataElementStore.get( idA ) ); + assertNull( dataElementStore.get( idB ) ); + assertNull( dataElementStore.get( idC ) ); + assertNull( dataElementStore.get( idD ) ); } @Test @@ -199,20 +182,20 @@ { DataElement dataElementA = createDataElement( 'A' ); DataElement dataElementB = createDataElement( 'B' ); - int idA = dataElementStore.addDataElement( dataElementA ); - int idB = dataElementStore.addDataElement( dataElementB ); + int idA = dataElementStore.save( dataElementA ); + int idB = dataElementStore.save( dataElementB ); - dataElementA = dataElementStore.getDataElementByName( "DataElementA" ); + dataElementA = dataElementStore.getByName( "DataElementA" ); assertNotNull( dataElementA ); assertEquals( idA, dataElementA.getId() ); assertEquals( "DataElementA", dataElementA.getName() ); - dataElementB = dataElementStore.getDataElementByName( "DataElementB" ); + dataElementB = dataElementStore.getByName( "DataElementB" ); assertNotNull( dataElementB ); assertEquals( idB, dataElementB.getId() ); assertEquals( "DataElementB", dataElementB.getName() ); - DataElement dataElementC = dataElementStore.getDataElementByName( "DataElementC" ); + DataElement dataElementC = dataElementStore.getByName( "DataElementC" ); assertNull( dataElementC ); } @@ -221,20 +204,20 @@ { DataElement dataElementA = createDataElement( 'A' ); DataElement dataElementB = createDataElement( 'B' ); - int idA = dataElementStore.addDataElement( dataElementA ); - int idB = dataElementStore.addDataElement( dataElementB ); + int idA = dataElementStore.save( dataElementA ); + int idB = dataElementStore.save( dataElementB ); - dataElementA = dataElementStore.getDataElementByAlternativeName( "DataElementAlternativeA" ); + dataElementA = dataElementStore.getByAlternativeName( "DataElementAlternativeA" ); assertNotNull( dataElementA ); assertEquals( idA, dataElementA.getId() ); assertEquals( "DataElementA", dataElementA.getName() ); - dataElementB = dataElementStore.getDataElementByAlternativeName( "DataElementAlternativeB" ); + dataElementB = dataElementStore.getByAlternativeName( "DataElementAlternativeB" ); assertNotNull( dataElementB ); assertEquals( idB, dataElementB.getId() ); assertEquals( "DataElementB", dataElementB.getName() ); - DataElement dataElementC = dataElementStore.getDataElementByAlternativeName( "DataElementAlternativeC" ); + DataElement dataElementC = dataElementStore.getByAlternativeName( "DataElementAlternativeC" ); assertNull( dataElementC ); } @@ -243,37 +226,37 @@ { DataElement dataElementA = createDataElement( 'A' ); DataElement dataElementB = createDataElement( 'B' ); - int idA = dataElementStore.addDataElement( dataElementA ); - int idB = dataElementStore.addDataElement( dataElementB ); + int idA = dataElementStore.save( dataElementA ); + int idB = dataElementStore.save( dataElementB ); - dataElementA = dataElementStore.getDataElementByShortName( "DataElementShortA" ); + dataElementA = dataElementStore.getByShortName( "DataElementShortA" ); assertNotNull( dataElementA ); assertEquals( idA, dataElementA.getId() ); assertEquals( "DataElementA", dataElementA.getName() ); - dataElementB = dataElementStore.getDataElementByShortName( "DataElementShortB" ); + dataElementB = dataElementStore.getByShortName( "DataElementShortB" ); assertNotNull( dataElementB ); assertEquals( idB, dataElementB.getId() ); assertEquals( "DataElementB", dataElementB.getName() ); - DataElement dataElementC = dataElementStore.getDataElementByShortName( "DataElementShortC" ); + DataElement dataElementC = dataElementStore.getByShortName( "DataElementShortC" ); assertNull( dataElementC ); } @Test public void testGetAllDataElements() { - assertEquals( 0, dataElementStore.getAllDataElements().size() ); + assertEquals( 0, dataElementStore.getAll().size() ); DataElement dataElementA = createDataElement( 'A' ); DataElement dataElementB = createDataElement( 'B' ); DataElement dataElementC = createDataElement( 'C' ); DataElement dataElementD = createDataElement( 'D' ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); Collection dataElementsRef = new HashSet(); dataElementsRef.add( dataElementA ); @@ -281,7 +264,7 @@ dataElementsRef.add( dataElementC ); dataElementsRef.add( dataElementD ); - Collection dataElements = dataElementStore.getAllDataElements(); + Collection dataElements = dataElementStore.getAll(); assertNotNull( dataElements ); assertEquals( dataElementsRef.size(), dataElements.size() ); assertTrue( dataElements.containsAll( dataElementsRef ) ); @@ -302,10 +285,10 @@ dataElementC.setType( DataElement.VALUE_TYPE_STRING ); dataElementD.setType( DataElement.VALUE_TYPE_INT ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); Collection dataElementsRef = new HashSet(); dataElementsRef.add( dataElementA ); @@ -332,17 +315,17 @@ DataElement dataElementD = createDataElement( 'D' ); dataElementD.setActive( false ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); Collection dataElementsRef = new HashSet(); dataElementsRef.add( dataElementA ); dataElementsRef.add( dataElementB ); dataElementsRef.add( dataElementC ); - assertEquals( dataElementsRef.size() + 1, dataElementStore.getAllDataElements().size() ); + assertEquals( dataElementsRef.size() + 1, dataElementStore.getAll().size() ); Collection dataElements = dataElementStore.getAllActiveDataElements(); assertNotNull( dataElements ); @@ -367,10 +350,10 @@ DataElement dataElementD = createDataElement( 'D' ); dataElementD.setAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); assertEquals( 1, dataElementStore.getDataElementsByAggregationOperator( DataElement.AGGREGATION_OPERATOR_AVERAGE ).size() ); @@ -393,10 +376,10 @@ DataElement dataElementD = createDataElement( 'D' ); dataElementD.setDomainType( DataElement.DOMAIN_TYPE_PATIENT ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); assertEquals( 1, dataElementStore.getDataElementsByDomainType( DataElement.DOMAIN_TYPE_AGGREGATE ).size() ); assertEquals( 3, dataElementStore.getDataElementsByDomainType( DataElement.DOMAIN_TYPE_PATIENT ).size() ); @@ -417,10 +400,10 @@ DataElement dataElementD = createDataElement( 'D' ); dataElementD.setType( DataElement.VALUE_TYPE_BOOL ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); assertEquals( 1, dataElementStore.getDataElementsByType( DataElement.VALUE_TYPE_INT ).size() ); assertEquals( 3, dataElementStore.getDataElementsByType( DataElement.VALUE_TYPE_BOOL ).size() ); @@ -434,11 +417,11 @@ DataElement dataElementA = createDataElement( 'A' ); dataElementA.setAggregationLevels( aggregationLevels ); - int idA = dataElementStore.addDataElement( dataElementA ); + int idA = dataElementStore.save( dataElementA ); - assertNotNull( dataElementStore.getDataElement( idA ).getAggregationLevels() ); - assertEquals( 2, dataElementStore.getDataElement( idA ).getAggregationLevels().size() ); - assertEquals( aggregationLevels, dataElementStore.getDataElement( idA ).getAggregationLevels() ); + assertNotNull( dataElementStore.get( idA ).getAggregationLevels() ); + assertEquals( 2, dataElementStore.get( idA ).getAggregationLevels().size() ); + assertEquals( aggregationLevels, dataElementStore.get( idA ).getAggregationLevels() ); } @Test @@ -452,10 +435,10 @@ dataElementA.setZeroIsSignificant( true ); dataElementB.setZeroIsSignificant( true ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); Collection dataElements = dataElementStore.getDataElementsByZeroIsSignificant( true ); @@ -472,12 +455,12 @@ DataElement dataElementE = createDataElement( 'E' ); DataElement dataElementF = createDataElement( 'F' ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); - dataElementStore.addDataElement( dataElementE ); - dataElementStore.addDataElement( dataElementF ); + dataElementStore.save( dataElementA ); + dataElementStore.save( dataElementB ); + dataElementStore.save( dataElementC ); + dataElementStore.save( dataElementD ); + dataElementStore.save( dataElementE ); + dataElementStore.save( dataElementF ); DataSet dataSetA = createDataSet( 'A', new MonthlyPeriodType() ); DataSet dataSetB = createDataSet( 'B', new MonthlyPeriodType() ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java 2011-04-22 21:04:14 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueServiceTest.java 2011-11-22 15:48:30 +0000 @@ -40,7 +40,7 @@ import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; -import org.hisp.dhis.dataelement.DataElementStore; +import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.Period; @@ -54,8 +54,6 @@ public class DataValueServiceTest extends DhisSpringTest { - private DataElementStore dataElementStore; - // ------------------------------------------------------------------------- // Supporting data // ------------------------------------------------------------------------- @@ -96,7 +94,7 @@ { dataValueService = (DataValueService) getBean( DataValueService.ID ); - dataElementStore = (DataElementStore) getBean( DataElementStore.ID ); + dataElementService = (DataElementService) getBean( DataElementService.ID ); categoryService = (DataElementCategoryService) getBean( DataElementCategoryService.ID ); @@ -113,10 +111,10 @@ dataElementC = createDataElement( 'C' ); dataElementD = createDataElement( 'D' ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementService.addDataElement( dataElementA ); + dataElementService.addDataElement( dataElementB ); + dataElementService.addDataElement( dataElementC ); + dataElementService.addDataElement( dataElementD ); periodA = createPeriod( getDay( 5 ), getDay( 6 ) ); periodB = createPeriod( getDay( 6 ), getDay( 7 ) ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueStoreTest.java 2011-11-03 01:02:13 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/datavalue/DataValueStoreTest.java 2011-11-22 15:48:30 +0000 @@ -40,7 +40,7 @@ import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; -import org.hisp.dhis.dataelement.DataElementStore; +import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.Period; @@ -56,8 +56,6 @@ { private DataValueStore dataValueStore; - private DataElementStore dataElementStore; - private PeriodStore periodStore; // ------------------------------------------------------------------------- @@ -99,8 +97,8 @@ throws Exception { dataValueStore = (DataValueStore) getBean( DataValueStore.ID ); - - dataElementStore = (DataElementStore) getBean( DataElementStore.ID ); + + dataElementService = (DataElementService) getBean( DataElementService.ID ); categoryService = (DataElementCategoryService) getBean( DataElementCategoryService.ID ); @@ -117,10 +115,10 @@ dataElementC = createDataElement( 'C' ); dataElementD = createDataElement( 'D' ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); - dataElementStore.addDataElement( dataElementD ); + dataElementService.addDataElement( dataElementA ); + dataElementService.addDataElement( dataElementB ); + dataElementService.addDataElement( dataElementC ); + dataElementService.addDataElement( dataElementD ); periodA = createPeriod( getDay( 5 ), getDay( 6 ) ); periodB = createPeriod( getDay( 6 ), getDay( 7 ) ); === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorGroupStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorGroupStoreTest.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorGroupStoreTest.java 2011-11-22 15:48:30 +0000 @@ -37,7 +37,6 @@ import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.common.GenericIdentifiableObjectStore; -import org.hisp.dhis.system.util.UUIdUtils; import org.junit.Test; /** @@ -126,23 +125,6 @@ } @Test - public void testGetIndicatorGroupByUUID() - throws Exception - { - String uuid = UUIdUtils.getUUId(); - - IndicatorGroup groupA = new IndicatorGroup( "IndicatorGroupA" ); - groupA.setUuid( uuid ); - - indicatorGroupStore.save( groupA ); - - groupA = indicatorGroupStore.getByUuid( uuid ); - - assertNotNull( groupA ); - assertEquals( groupA.getUuid(), uuid ); - } - - @Test public void testGetAllIndicatorGroups() throws Exception { === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java 2011-02-15 20:14:22 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorServiceTest.java 2011-11-22 15:48:30 +0000 @@ -237,21 +237,6 @@ } @Test - public void testGetIndicatorGroupByUUID() - throws Exception - { - IndicatorGroup groupA = new IndicatorGroup( "IndicatorGroupA" ); - int id = indicatorService.addIndicatorGroup( groupA ); - - groupA = indicatorService.getIndicatorGroup( id ); - String uuid = groupA.getUuid(); - - IndicatorGroup groupB = indicatorService.getIndicatorGroup( uuid ); - - assertEquals( groupA, groupB ); - } - - @Test public void testGetAllIndicatorGroups() throws Exception { @@ -416,24 +401,6 @@ } @Test - public void testGetIndicatorByUUID() - throws Exception - { - IndicatorType type = new IndicatorType( "IndicatorType", 100, false ); - indicatorService.addIndicatorType( type ); - - Indicator indicatorA = createIndicator( 'A', type ); - int idA = indicatorService.addIndicator( indicatorA ); - - indicatorA = indicatorService.getIndicator( idA ); - String uuid = indicatorA.getUuid(); - - Indicator indicatorB = indicatorService.getIndicator( uuid ); - - assertEquals( indicatorA, indicatorB ); - } - - @Test public void testGetAllIndicators() throws Exception { === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.java 2011-04-30 10:05:14 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/indicator/IndicatorStoreTest.java 2011-11-22 15:48:30 +0000 @@ -37,7 +37,6 @@ import org.hisp.dhis.DhisSpringTest; import org.hisp.dhis.common.GenericIdentifiableObjectStore; -import org.hisp.dhis.system.util.UUIdUtils; import org.junit.Test; /** @@ -278,26 +277,6 @@ } @Test - public void testGetIndicatorByUUID() - throws Exception - { - String uuid = UUIdUtils.getUUId(); - - IndicatorType type = new IndicatorType( "IndicatorType", 100, false ); - indicatorTypeStore.save( type ); - - Indicator indicatorA = createIndicator( 'A', type ); - indicatorA.setUuid( uuid ); - - indicatorStore.addIndicator( indicatorA ); - - indicatorA = indicatorStore.getIndicator( uuid ); - - assertNotNull( indicatorA ); - assertEquals( indicatorA.getUuid(), uuid ); - } - - @Test public void testGetAllIndicators() throws Exception { === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java 2011-09-14 14:35:02 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/organisationunit/OrganisationUnitServiceTest.java 2011-11-22 15:48:30 +0000 @@ -190,21 +190,6 @@ } @Test - public void testGetOrganisationUnitByUUID() - throws Exception - { - OrganisationUnit unit1 = new OrganisationUnit( "name1", "shortName1", "organisationUnitCode1", new Date(), new Date(), true, "comment" ); - int id1 = organisationUnitService.addOrganisationUnit( unit1 ); - - unit1 = organisationUnitService.getOrganisationUnit( id1 ); - String uuid = unit1.getUuid(); - - OrganisationUnit unit2 = organisationUnitService.getOrganisationUnit( uuid ); - - assertEquals( unit1, unit2 ); - } - - @Test public void testGetOrganisationUnitGraph() throws Exception { @@ -526,21 +511,6 @@ assertEquals( group2.getName(), oUG2Name ); } - @Test - public void testGetOrganisationUnitGroupByUUID() - throws Exception - { - OrganisationUnitGroup group1 = new OrganisationUnitGroup( "name1" ); - int id1 = organisationUnitGroupService.addOrganisationUnitGroup( group1 ); - - group1 = organisationUnitGroupService.getOrganisationUnitGroup( id1 ); - String uuid = group1.getUuid(); - - OrganisationUnitGroup group2 = organisationUnitGroupService.getOrganisationUnitGroup( uuid ); - - assertEquals( group1, group2 ); - } - // ------------------------------------------------------------------------- // OrganisationUnitHierarchy // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/period/PeriodStoreTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/period/PeriodStoreTest.java 2011-11-03 01:02:13 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/period/PeriodStoreTest.java 2011-11-22 15:48:30 +0000 @@ -43,7 +43,7 @@ import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; -import org.hisp.dhis.dataelement.DataElementStore; +import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.datavalue.DataValue; import org.hisp.dhis.datavalue.DataValueStore; import org.hisp.dhis.organisationunit.OrganisationUnit; @@ -59,8 +59,6 @@ { private PeriodStore periodStore; - private DataElementStore dataElementStore; - private DataValueStore dataValueStore; private DataElementCategoryOptionCombo optionCombo; @@ -75,7 +73,7 @@ { periodStore = (PeriodStore) getBean( PeriodStore.ID ); - dataElementStore = (DataElementStore) getBean( DataElementStore.ID ); + dataElementService = (DataElementService) getBean( DataElementService.ID ); categoryService = (DataElementCategoryService) getBean( DataElementCategoryService.ID ); @@ -574,9 +572,9 @@ DataValue dataValueI = new DataValue( dataElementB, w05, sourceA, optionCombo ); dataValueI.setValue( "9" ); - dataElementStore.addDataElement( dataElementA ); - dataElementStore.addDataElement( dataElementB ); - dataElementStore.addDataElement( dataElementC ); + dataElementService.addDataElement( dataElementA ); + dataElementService.addDataElement( dataElementB ); + dataElementService.addDataElement( dataElementC ); organisationUnitService.addOrganisationUnit( sourceA ); organisationUnitService.addOrganisationUnit( sourceB ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementGroupRowHandler.java 2011-11-22 15:48:30 +0000 @@ -69,8 +69,6 @@ { final DataElementGroup dataElementGroup = (DataElementGroup) object; - dataElementGroup.setUuid( UUIdUtils.getUUId() ); - importObject( dataElementGroup, params ); } } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/DataElementRowHandler.java 2011-11-22 15:48:30 +0000 @@ -77,7 +77,6 @@ { final DataElement dataElement = (DataElement) object; - dataElement.setUuid( UUIdUtils.getUUId() ); dataElement.setActive( true ); if ( dataElement.getCode() != null && dataElement.getCode().trim().length() == 0 ) === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorGroupRowHandler.java 2011-11-22 15:48:30 +0000 @@ -69,8 +69,6 @@ { final IndicatorGroup indicatorGroup = (IndicatorGroup) object; - indicatorGroup.setUuid( UUIdUtils.getUUId() ); - importObject( indicatorGroup, params ); } } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java 2011-09-24 11:35:11 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/IndicatorRowHandler.java 2011-11-22 15:48:30 +0000 @@ -89,8 +89,6 @@ { final Indicator indicator = (Indicator) object; - indicator.setUuid( UUIdUtils.getUUId() ); - if ( indicator.getAlternativeName() != null && indicator.getAlternativeName().trim().length() == 0 ) { indicator.setAlternativeName( null ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitGroupRowHandler.java 2011-11-22 15:48:30 +0000 @@ -69,8 +69,6 @@ { final OrganisationUnitGroup group = (OrganisationUnitGroup) object; - group.setUuid( UUIdUtils.getUUId() ); - importObject( group, params ); } } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java 2011-04-22 21:04:14 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/file/rowhandler/OrganisationUnitRowHandler.java 2011-11-22 15:48:30 +0000 @@ -72,8 +72,6 @@ { final OrganisationUnit unit = (OrganisationUnit) object; - unit.setUuid( UUIdUtils.getUUId() ); - if ( unit.getCode() != null && unit.getCode().trim().length() == 0 ) { unit.setCode( null ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java 2011-10-25 18:25:34 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementConverter.java 2011-11-22 15:48:30 +0000 @@ -55,7 +55,6 @@ public static final String ELEMENT_NAME = "dataElement"; private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; private static final String FIELD_NAME = "name"; private static final String FIELD_ALTERNATIVE_NAME = "alternativeName"; private static final String FIELD_SHORT_NAME = "shortName"; @@ -124,7 +123,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( element.getId() ) ); - writer.writeElement( FIELD_UUID, element.getUuid() ); writer.writeElement( FIELD_NAME, element.getName() ); writer.writeElement( FIELD_ALTERNATIVE_NAME, element.getAlternativeName() ); writer.writeElement( FIELD_SHORT_NAME, element.getShortName() ); @@ -156,7 +154,6 @@ element.setCategoryCombo( categoryCombo ); element.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - element.setUuid( values.get( FIELD_UUID ) ); element.setName( values.get( FIELD_NAME ) ); element.setAlternativeName( values.get( FIELD_ALTERNATIVE_NAME ) ); element.setShortName( values.get( FIELD_SHORT_NAME ) ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupConverter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupConverter.java 2011-11-22 15:48:30 +0000 @@ -51,8 +51,7 @@ public static final String COLLECTION_NAME = "dataElementGroups"; public static final String ELEMENT_NAME = "dataElementGroup"; - private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; + private static final String FIELD_ID = "id"; private static final String FIELD_NAME = "name"; // ------------------------------------------------------------------------- @@ -100,7 +99,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( group.getId() ) ); - writer.writeElement( FIELD_UUID, group.getUuid() ); writer.writeElement( FIELD_NAME, group.getName() ); writer.closeElement(); @@ -119,7 +117,6 @@ final DataElementGroup group = new DataElementGroup(); group.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - group.setUuid( values.get( FIELD_UUID ) ); group.setName( values.get( FIELD_NAME ) ); importObject( group, params ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupSetConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupSetConverter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataElementGroupSetConverter.java 2011-11-22 15:48:30 +0000 @@ -51,8 +51,7 @@ public static final String COLLECTION_NAME = "dataElementGroupSets"; public static final String ELEMENT_NAME = "dataElementGroupSet"; - private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; + private static final String FIELD_ID = "id"; private static final String FIELD_NAME = "name"; // ------------------------------------------------------------------------- @@ -91,7 +90,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( groupSet.getId() ) ); - writer.writeElement( FIELD_UUID, groupSet.getUuid() ); writer.writeElement( FIELD_NAME, groupSet.getName() ); writer.closeElement(); @@ -111,7 +109,6 @@ final DataElementGroupSet groupSet = new DataElementGroupSet(); groupSet.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - groupSet.setUuid( values.get( FIELD_UUID ) ); groupSet.setName( values.get( FIELD_NAME ) ); importObject( groupSet, params ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetConverter.java 2011-02-15 06:36:28 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/DataSetConverter.java 2011-11-22 15:48:30 +0000 @@ -59,7 +59,6 @@ private static final String FIELD_SHORT_NAME = "shortName"; private static final String FIELD_CODE = "code"; private static final String FIELD_PERIOD_TYPE = "periodType"; - private static final String FIELD_UUID = "uuid"; // ------------------------------------------------------------------------- // Properties @@ -151,7 +150,6 @@ dataSet.setName( values.get( FIELD_NAME ) ); dataSet.setShortName( values.get( FIELD_SHORT_NAME ) ); dataSet.setCode( values.get( FIELD_CODE ) ); - dataSet.setUuid( values.get( FIELD_UUID) ); dataSet.getPeriodType().setId( periodTypeMapping.get( values.get( FIELD_PERIOD_TYPE ) ) ); importObject( dataSet, params ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java 2011-09-24 11:35:11 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorConverter.java 2011-11-22 15:48:30 +0000 @@ -56,7 +56,6 @@ public static final String ELEMENT_NAME = "indicator"; private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; private static final String FIELD_NAME = "name"; private static final String FIELD_ALTERNATIVE_NAME = "alternativeName"; private static final String FIELD_SHORT_NAME = "shortName"; @@ -141,7 +140,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( indicator.getId() ) ); - writer.writeElement( FIELD_UUID, indicator.getUuid() ); writer.writeElement( FIELD_NAME, indicator.getName() ); writer.writeElement( FIELD_ALTERNATIVE_NAME, indicator.getAlternativeName() ); writer.writeElement( FIELD_SHORT_NAME, indicator.getShortName() ); @@ -173,7 +171,6 @@ final IndicatorType type = new IndicatorType(); indicator.setIndicatorType( type ); indicator.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - indicator.setUuid( values.get( FIELD_UUID ) ); indicator.setName( values.get( FIELD_NAME ) ); indicator.setAlternativeName( values.get( FIELD_ALTERNATIVE_NAME ) ); indicator.setShortName( values.get( FIELD_SHORT_NAME ) ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupConverter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupConverter.java 2011-11-22 15:48:30 +0000 @@ -52,7 +52,6 @@ public static final String ELEMENT_NAME = "indicatorGroup"; private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; private static final String FIELD_NAME = "name"; // ------------------------------------------------------------------------- @@ -100,7 +99,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( group.getId() ) ); - writer.writeElement( FIELD_UUID, group.getUuid() ); writer.writeElement( FIELD_NAME, group.getName() ); writer.closeElement(); @@ -119,7 +117,6 @@ final IndicatorGroup group = new IndicatorGroup(); group.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - group.setUuid( values.get( FIELD_UUID ) ); group.setName( values.get( FIELD_NAME ) ); importObject( group, params ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupSetConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupSetConverter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/IndicatorGroupSetConverter.java 2011-11-22 15:48:30 +0000 @@ -52,7 +52,6 @@ public static final String ELEMENT_NAME = "indicatorGroupSet"; private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; private static final String FIELD_NAME = "name"; // ------------------------------------------------------------------------- @@ -100,7 +99,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( groupSet.getId() ) ); - writer.writeElement( FIELD_UUID, String.valueOf( groupSet.getUuid() ) ); writer.writeElement( FIELD_NAME, groupSet.getName() ); writer.closeElement(); @@ -119,7 +117,6 @@ final IndicatorGroupSet groupSet = new IndicatorGroupSet(); groupSet.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - groupSet.setUuid( values.get( FIELD_UUID ) ); groupSet.setName( values.get( FIELD_NAME ) ); importObject( groupSet, params ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java 2011-06-29 11:04:32 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitConverter.java 2011-11-22 15:48:30 +0000 @@ -58,7 +58,6 @@ public static final String ELEMENT_NAME = "organisationUnit"; private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; private static final String FIELD_NAME = "name"; private static final String FIELD_SHORT_NAME = "shortName"; private static final String FIELD_CODE = "code"; @@ -120,7 +119,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( unit.getId() ) ); - writer.writeElement( FIELD_UUID, unit.getUuid() ); writer.writeElement( FIELD_NAME, unit.getName() ); writer.writeElement( FIELD_SHORT_NAME, unit.getShortName() ); writer.writeElement( FIELD_CODE, unit.getCode() ); @@ -167,9 +165,6 @@ reader.moveToStartElement( FIELD_ID ); unit.setId( Integer.parseInt( reader.getElementValue() ) ); - reader.moveToStartElement( FIELD_UUID ); - unit.setUuid( reader.getElementValue() ); - reader.moveToStartElement( FIELD_NAME ); unit.setName(reader.getElementValue() ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitGroupConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitGroupConverter.java 2010-05-29 16:06:56 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/OrganisationUnitGroupConverter.java 2011-11-22 15:48:30 +0000 @@ -52,7 +52,6 @@ public static final String ELEMENT_NAME = "organisationUnitGroup"; private static final String FIELD_ID = "id"; - private static final String FIELD_UUID = "uuid"; private static final String FIELD_NAME = "name"; // ------------------------------------------------------------------------- @@ -100,7 +99,6 @@ writer.openElement( ELEMENT_NAME ); writer.writeElement( FIELD_ID, String.valueOf( group.getId() ) ); - writer.writeElement( FIELD_UUID, group.getUuid() ); writer.writeElement( FIELD_NAME, group.getName() ); writer.closeElement(); @@ -118,8 +116,7 @@ final OrganisationUnitGroup group = new OrganisationUnitGroup(); - group.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); - group.setUuid( values.get( FIELD_UUID ) ); + group.setId( Integer.parseInt( values.get( FIELD_ID ) ) ); group.setName( values.get( FIELD_NAME ) ); importObject( group, params ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java 2011-06-03 13:11:34 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/converter/ValidationRuleConverter.java 2011-11-22 15:48:30 +0000 @@ -55,23 +55,15 @@ implements XMLConverter { public static final String COLLECTION_NAME = "validationRules"; - public static final String ELEMENT_NAME = "validationRule"; private static final String FIELD_NAME = "name"; - private static final String FIELD_DESCRIPTION = "description"; - private static final String FIELD_TYPE = "type"; - private static final String FIELD_OPERATOR = "operator"; - private static final String FIELD_LEFTSIDE_EXPRESSION = "leftSideExpression"; - private static final String FIELD_LEFTSIDE_DESCRIPTION = "leftSideDescription"; - private static final String FIELD_RIGHTSIDE_EXPRESSION = "rightSideExpression"; - private static final String FIELD_RIGHTSIDE_DESCRIPTION = "rightSideDescription"; // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataSetMapper.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataSetMapper.java 2011-09-12 09:13:33 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataSetMapper.java 2011-11-22 15:48:30 +0000 @@ -22,7 +22,7 @@ dxfDataSet.setName( dataSet.getName() ); dxfDataSet.setPeriodType( dataSet.getPeriodType().getName() ); dxfDataSet.setShortName( dataSet.getShortName() ); - dxfDataSet.setId( dataSet.getUuid() ); + dxfDataSet.setId( dataSet.getUid() ); dxfDataSet.setDataElements( getDataElements( dataSet.getDataElements() ) ); dxfDataSet.setOrgUnitLinks( linkBuilder.getLinks( dataSet.getSources() ) ); @@ -45,7 +45,7 @@ { DataElement dxfElement = new DataElement(); - dxfElement.setId( dataElement.getUuid() ); + dxfElement.setId( dataElement.getUid() ); dxfElement.setName( dataElement.getName() ); dxfElement.setType( dataElement.getType() ); @@ -67,7 +67,7 @@ for ( DataElementCategoryOptionCombo optionCombo : optionCombos ) { CategoryOptionCombo dxfCombo = new CategoryOptionCombo(); - dxfCombo.setId( optionCombo.getUuid() ); + dxfCombo.setId( optionCombo.getUid() ); dxfCombo.setName( optionCombo.getName() ); dxfCombos.add( dxfCombo ); } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java 2011-11-03 03:10:49 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetService.java 2011-11-22 15:48:30 +0000 @@ -134,8 +134,8 @@ if ( !dataSet.getSources().contains( unit ) ) { - throw new IllegalArgumentException( "Org unit with UUID " + unit.getUuid() - + " does not report data set with UUID " + dataSet.getUuid() ); + throw new IllegalArgumentException( "Org unit with UUID " + unit.getUid() + + " does not report data set with UUID " + dataSet.getUid() ); } Period period = getPeriod( dataValueSet.getPeriodIsoDate(), dataSet.getPeriodType() ); @@ -187,7 +187,7 @@ if ( dataSets == null || dataSets.isEmpty() ) { - throw new IllegalArgumentException( "Data element '" + dataElement.getUuid() + "' isn't in a data set." ); + throw new IllegalArgumentException( "Data element '" + dataElement.getUid() + "' isn't in a data set." ); } else if ( dataSets.size() == 1 ) { @@ -221,7 +221,7 @@ String message = "Ambiguous which of these data set the data values belong to: "; for ( DataSet p : potential ) { - message += p.getUuid() + ", "; + message += p.getUid() + ", "; } message.substring( 0, message.length() - 2 ); throw new IllegalArgumentException( message ); @@ -234,8 +234,8 @@ if ( !dataSet.getDataElements().contains( dataElement ) ) { - throw new IllegalArgumentException( "Data element '" + dataElement.getUuid() + "' isn't in data set " - + dataSet.getUuid() ); + throw new IllegalArgumentException( "Data element '" + dataElement.getUid() + "' isn't in data set " + + dataSet.getUid() ); } DataElementCategoryOptionCombo combo = getOptionCombo( dxfValue.getCategoryOptionComboIdentifier(), dataElement ); @@ -368,8 +368,8 @@ if ( !dataElement.getCategoryCombo().getOptionCombos().contains( combo ) ) { - throw new IllegalArgumentException( "DataElementCategoryOptionCombo with UUID '" + combo.getUuid() - + "' isn't in DataElement '" + dataElement.getUuid() + "'" ); + throw new IllegalArgumentException( "DataElementCategoryOptionCombo with UUID '" + combo.getUid() + + "' isn't in DataElement '" + dataElement.getUid() + "'" ); } return combo; } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java 2011-09-12 09:13:33 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/LinkBuilderImpl.java 2011-11-22 15:48:30 +0000 @@ -25,7 +25,7 @@ Link link = new Link(); link.setName( target.getName() ); - link.setId( target.getUuid() ); + link.setId( target.getUid() ); return link; } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/OrgUnitMapper.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/OrgUnitMapper.java 2011-09-12 09:13:33 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/OrgUnitMapper.java 2011-11-22 15:48:30 +0000 @@ -14,7 +14,7 @@ OrgUnit dxfUnit = new OrgUnit(); dxfUnit.setName( unit.getName() ); - dxfUnit.setId( unit.getUuid() ); + dxfUnit.setId( unit.getUid() ); OrganisationUnit parent = unit.getParent(); if ( parent != null ) === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/StaXDataValueImportService.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/StaXDataValueImportService.java 2011-09-24 11:42:20 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf2/service/StaXDataValueImportService.java 2011-11-22 15:48:30 +0000 @@ -409,9 +409,6 @@ } switch ( idScheme ) { - case UUID: - result = DataElement.getUUIDMap( dataelements ); - break; case CODE: result = DataElement.getCodeMap( dataelements ); break; @@ -439,9 +436,6 @@ switch ( idScheme ) { - case UUID: - result = OrganisationUnit.getUUIDMap( orgunits ); - break; case CODE: result = OrganisationUnit.getCodeMap( orgunits ); break; === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupImporter.java 2010-05-31 13:53:07 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementGroupImporter.java 2011-11-22 15:48:30 +0000 @@ -71,7 +71,6 @@ @Override protected void importMatching( DataElementGroup object, DataElementGroup match ) { - match.setUuid( object.getUuid() ); match.setName( object.getName() ); dataElementService.updateDataElementGroup( match ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java 2011-10-25 18:25:34 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/DataElementImporter.java 2011-11-22 15:48:30 +0000 @@ -72,7 +72,6 @@ @Override protected void importMatching( DataElement object, DataElement match ) { - match.setUuid( object.getUuid() ); match.setName( object.getName() ); match.setShortName( object.getShortName() ); match.setAlternativeName( object.getAlternativeName() ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupImporter.java 2010-05-31 13:53:07 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorGroupImporter.java 2011-11-22 15:48:30 +0000 @@ -71,7 +71,6 @@ @Override protected void importMatching( IndicatorGroup object, IndicatorGroup match ) { - match.setUuid( object.getUuid() ); match.setName( object.getName() ); indicatorService.updateIndicatorGroup( object ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java 2011-10-05 11:50:05 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/IndicatorImporter.java 2011-11-22 15:48:30 +0000 @@ -71,7 +71,6 @@ @Override protected void importMatching( Indicator object, Indicator match ) { - match.setUuid( object.getUuid() ); match.setName( object.getName() ); match.setAlternativeName( object.getAlternativeName() ); match.setShortName( object.getShortName() ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitGroupImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitGroupImporter.java 2010-05-31 13:53:07 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitGroupImporter.java 2011-11-22 15:48:30 +0000 @@ -67,7 +67,6 @@ @Override protected void importMatching( OrganisationUnitGroup object, OrganisationUnitGroup match ) { - match.setUuid( object.getUuid() ); match.setName( object.getName() ); organisationUnitGroupService.updateOrganisationUnitGroup( match ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java' --- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java 2011-10-05 11:50:05 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/importer/OrganisationUnitImporter.java 2011-11-22 15:48:30 +0000 @@ -73,7 +73,6 @@ @Override protected void importMatching( OrganisationUnit object, OrganisationUnit match ) { - match.setUuid( defaultIfEmpty( object.getUuid(), match.getUuid() ) ); match.setName( object.getName() ); match.setShortName( defaultIfEmpty( object.getShortName(), match.getShortName() ) ); match.setCode( defaultIfEmpty( object.getCode(), match.getCode() ) ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetServiceTest.java' --- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetServiceTest.java 2011-10-05 11:50:05 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/dxf2/service/DataValueSetServiceTest.java 2011-11-22 15:48:30 +0000 @@ -133,7 +133,6 @@ } ); defaultCombo = categoryService.getDefaultDataElementCategoryOptionCombo(); - defaultCombo.setUuid( DEFAULT_COMBO_UUID ); categoryService.updateDataElementCategoryOptionCombo( defaultCombo ); } @@ -498,8 +497,6 @@ private void verifyDataValue( long before, long after, DataValue dv, String value ) { - assertEquals( DATA_ELEMENT_UUID, dv.getDataElement().getUuid() ); - assertEquals( ORGANISATION_UNIT_UUID, dv.getSource().getUuid() ); assertEquals( new WeeklyPeriodType().createPeriod( "2011W5" ), dv.getPeriod() ); assertEquals( value, dv.getValue() ); === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/mapping/ObjectMappingGeneratorTest.java' --- dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/mapping/ObjectMappingGeneratorTest.java 2010-04-12 21:23:33 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/java/org/hisp/dhis/importexport/mapping/ObjectMappingGeneratorTest.java 2011-11-22 15:48:30 +0000 @@ -210,27 +210,4 @@ assertEquals( mapping.get( Integer.valueOf( 'A' ) ), Integer.valueOf( 'A' ) ); assertEquals( mapping.get( Integer.valueOf( 'B' ) ), Integer.valueOf( 'B' ) ); } - - @Test - public void testOrganisationUnitMappingWithUUID() - { - OrganisationUnit organisationUnitA = createOrganisationUnit( 'A' ); - OrganisationUnit organisationUnitB = createOrganisationUnit( 'B' ); - - NameMappingUtil.addOrganisationUnitMapping( organisationUnitA.getUuid(), organisationUnitA.getName() ); - NameMappingUtil.addOrganisationUnitMapping( organisationUnitB.getUuid(), organisationUnitB.getName() ); - - int idA = organisationUnitService.addOrganisationUnit( organisationUnitA ); - int idB = organisationUnitService.addOrganisationUnit( organisationUnitB ); - - Map mapping = objectMappingGenerator.getOrganisationUnitMapping( false ); - - assertEquals( mapping.get( organisationUnitA.getUuid() ), Integer.valueOf( idA ) ); - assertEquals( mapping.get( organisationUnitB.getUuid() ), Integer.valueOf( idB ) ); - - mapping = objectMappingGenerator.getOrganisationUnitMapping( true ); - - assertEquals( mapping.get( organisationUnitA.getUuid() ), Integer.valueOf( -1 ) ); - assertEquals( mapping.get( organisationUnitB.getUuid() ), Integer.valueOf( -1 ) ); - } } === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml 2011-09-24 11:35:11 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml 2011-11-22 15:48:30 +0000 @@ -135,7 +135,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementA AlternativeNameA ShortNameA @@ -148,7 +148,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementB AlternativeNameB ShortNameB @@ -161,7 +161,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementC AlternativeNameC ShortNameC @@ -176,17 +176,17 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementGroupC @@ -248,7 +248,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA IndicatorA AlternativeNameA ShortNameA @@ -263,7 +263,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB IndicatorB AlternativeNameB ShortNameB @@ -278,7 +278,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC IndicatorC AlternativeNameC ShortNameC @@ -295,17 +295,17 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA IndicatorGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB IndicatorGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC IndicatorGroupC @@ -405,7 +405,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitA ShortNameA CodeA @@ -417,7 +417,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitB ShortNameB CodeB @@ -429,7 +429,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC OrganisationUnitC ShortNameC CodeC @@ -453,17 +453,17 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC OrganisationUnitGroupC === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz' Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz 2010-12-05 17:38:27 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.xml.gz 2011-11-22 15:48:30 +0000 differ === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip' Binary files dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip 2011-09-24 11:35:11 +0000 and dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfA.zip 2011-11-22 15:48:30 +0000 differ === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml 2011-09-24 11:35:11 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfB.xml 2011-11-22 15:48:30 +0000 @@ -135,7 +135,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementA AlternativeNameA ShortNameA @@ -148,7 +148,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementB AlternativeNameB ShortNameB @@ -161,7 +161,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementC AlternativeNameC ShortNameC @@ -174,7 +174,7 @@ 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD DataElementD AlternativeNameD ShortNameD @@ -187,7 +187,7 @@ 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE DataElementE AlternativeNameE ShortNameE @@ -202,27 +202,27 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementGroupC 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD DataElementGroupD 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE DataElementGroupE @@ -358,7 +358,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA IndicatorA AlternativeNameA ShortNameA @@ -373,7 +373,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB IndicatorB AlternativeNameB ShortNameB @@ -390,7 +390,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC IndicatorC AlternativeNameC ShortNameC @@ -405,7 +405,7 @@ 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD IndicatorD AlternativeNameD ShortNameD @@ -420,7 +420,7 @@ 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE IndicatorE AlternativeNameE ShortNameE @@ -437,27 +437,27 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA IndicatorGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB IndicatorGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC IndicatorGroupC 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD IndicatorGroupD 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE IndicatorGroupE @@ -695,7 +695,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + BE3133935ECA OrganisationUnitA ShortNameA CodeA @@ -707,7 +707,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + BE3133935ECB OrganisationUnitB ShortNameB CodeB @@ -719,7 +719,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + BE3133935ECC OrganisationUnitC ShortNameC CodeC @@ -731,7 +731,7 @@ 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + BE3133935ECD OrganisationUnitD ShortNameD CodeD @@ -743,7 +743,7 @@ 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + BE3133935ECE OrganisationUnitE ShortNameE CodeE @@ -775,27 +775,27 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC OrganisationUnitGroupC 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD OrganisationUnitGroupD 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE OrganisationUnitGroupE === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml 2011-09-24 11:35:11 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfC.xml 2011-11-22 15:48:30 +0000 @@ -135,7 +135,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementA AlternativeNameA2 ShortNameA @@ -148,7 +148,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementB AlternativeNameB ShortNameB2 @@ -161,7 +161,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementC AlternativeNameC ShortNameC @@ -174,7 +174,7 @@ 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD DataElementD AlternativeNameD ShortNameD @@ -187,7 +187,7 @@ 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE DataElementE AlternativeNameE ShortNameE @@ -202,27 +202,27 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementGroupC 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD DataElementGroupD 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE DataElementGroupE @@ -358,7 +358,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA IndicatorA AlternativeNameA2 ShortNameA @@ -373,7 +373,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB IndicatorB AlternativeNameB ShortNameB2 @@ -388,7 +388,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC IndicatorC AlternativeNameC ShortNameC @@ -403,7 +403,7 @@ 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD IndicatorD AlternativeNameD ShortNameD @@ -418,7 +418,7 @@ 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE IndicatorE AlternativeNameE ShortNameE @@ -435,27 +435,27 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA IndicatorGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB IndicatorGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC IndicatorGroupC 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD IndicatorGroupD 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE IndicatorGroupE @@ -693,7 +693,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitA ShortNameA2 CodeA @@ -705,7 +705,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitB ShortNameB2 CodeB @@ -717,7 +717,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC OrganisationUnitC ShortNameC CodeC2 @@ -729,7 +729,7 @@ 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD OrganisationUnitD ShortNameD CodeD @@ -741,7 +741,7 @@ 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE OrganisationUnitE ShortNameE CodeE @@ -773,27 +773,27 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitGroupA 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitGroupB 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC OrganisationUnitGroupC 68 - C3C2E28D-9686-4634-93FD-BE3133935ECD + E3133935ECD OrganisationUnitGroupD 69 - C3C2E28D-9686-4634-93FD-BE3133935ECE + E3133935ECE OrganisationUnitGroupE === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfD.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfD.xml 2010-09-13 10:47:37 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfD.xml 2011-11-22 15:48:30 +0000 @@ -135,7 +135,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementA AlternativeNameA ShortNameA @@ -148,7 +148,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementB AlternativeNameB ShortNameB @@ -163,7 +163,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitA ShortNameA CodeA @@ -175,7 +175,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitB ShortNameB CodeB === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfE.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfE.xml 2010-09-13 10:47:37 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfE.xml 2011-11-22 15:48:30 +0000 @@ -135,7 +135,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementA AlternativeNameA ShortNameA @@ -148,7 +148,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementB AlternativeNameB ShortNameB @@ -161,7 +161,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementC AlternativeNameC ShortNameC @@ -176,7 +176,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitA ShortNameA CodeA @@ -188,7 +188,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitB ShortNameB CodeB === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfF.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfF.xml 2010-09-13 10:47:37 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfF.xml 2011-11-22 15:48:30 +0000 @@ -135,7 +135,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementA AlternativeNameA2 ShortNameA @@ -148,7 +148,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementB AlternativeNameB2 ShortNameB @@ -161,7 +161,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementC AlternativeNameC ShortNameC @@ -176,7 +176,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitA ShortNameA CodeA @@ -188,7 +188,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitB ShortNameB CodeB === modified file 'dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfG.xml' --- dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfG.xml 2010-09-13 10:47:37 +0000 +++ dhis-2/dhis-services/dhis-service-importexport/src/test/resources/dxfG.xml 2011-11-22 15:48:30 +0000 @@ -135,7 +135,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA DataElementA AlternativeNameA ShortNameA @@ -148,7 +148,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB DataElementB AlternativeNameB ShortNameB @@ -161,7 +161,7 @@ 67 - C3C2E28D-9686-4634-93FD-BE3133935ECC + E3133935ECC DataElementC AlternativeNameC ShortNameC @@ -176,7 +176,7 @@ 65 - C3C2E28D-9686-4634-93FD-BE3133935ECA + E3133935ECA OrganisationUnitA ShortNameA CodeA @@ -188,7 +188,7 @@ 66 - C3C2E28D-9686-4634-93FD-BE3133935ECB + E3133935ECB OrganisationUnitB ShortNameB CodeB === modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml' --- dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml 2011-09-22 09:15:51 +0000 +++ dhis-2/dhis-services/dhis-service-reporting/src/main/resources/org/hisp/dhis/report/hibernate/Report.hbm.xml 2011-11-22 15:48:30 +0000 @@ -12,8 +12,6 @@ - - === modified file 'dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java' --- dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2011-11-03 01:02:13 +0000 +++ dhis-2/dhis-support/dhis-support-hibernate/src/main/java/org/hisp/dhis/hibernate/HibernateGenericStore.java 2011-11-22 15:48:30 +0000 @@ -216,12 +216,6 @@ } @Override - public final T getByUuid( String uuid ) - { - return getObject( Restrictions.eq( "uuid", uuid ) ); - } - - @Override public final T getByUid( String uid ) { return getObject( Restrictions.eq( "uid", uid ) ); === 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 2011-01-17 17:03:05 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -92,7 +92,6 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); statementBuilder.setColumn( "alternativename" ); statementBuilder.setColumn( "shortname" ); @@ -108,8 +107,7 @@ } protected void setValues( DataElement dataElement ) - { - statementBuilder.setValue( dataElement.getUuid() ); + { statementBuilder.setValue( dataElement.getName() ); statementBuilder.setValue( dataElement.getAlternativeName() ); statementBuilder.setValue( dataElement.getShortName() ); === 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 2010-11-23 16:12:57 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -86,14 +86,12 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); statementBuilder.setColumn( "conceptid" ); } protected void setValues( DataElementCategory category ) { - statementBuilder.setValue( category.getUuid() ); statementBuilder.setValue( category.getName() ); statementBuilder.setValue( category.getConcept().getId() ); } === 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 2011-10-12 22:13:19 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementCategoryOptionBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -87,12 +87,10 @@ protected void setColumns() { statementBuilder.setColumn( "name" ); - statementBuilder.setColumn( "uuid" ); } protected void setValues( DataElementCategoryOption categoryOption ) { statementBuilder.setValue( categoryOption.getName() ); - statementBuilder.setValue( categoryOption.getUuid() ); } } === 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 2010-11-23 16:12:57 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -85,14 +85,12 @@ } protected void setColumns() - { - statementBuilder.setColumn( "uuid" ); + { statementBuilder.setColumn( "name" ); } protected void setValues( DataElementGroup group ) - { - statementBuilder.setValue( group.getUuid() ); + { statementBuilder.setValue( group.getName() ); } } === 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 2010-11-23 16:12:57 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -85,14 +85,12 @@ } protected void setColumns() - { - statementBuilder.setColumn( "uuid" ); + { statementBuilder.setColumn( "name" ); } protected void setValues( DataElementGroupSet groupSet ) - { - statementBuilder.setValue( groupSet.getUuid() ); + { statementBuilder.setValue( groupSet.getName() ); } } === 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 2011-02-15 06:36:28 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -90,7 +90,6 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); statementBuilder.setColumn( "shortName" ); statementBuilder.setColumn( "code" ); @@ -101,7 +100,6 @@ protected void setValues( DataSet dataSet ) { - statementBuilder.setValue( dataSet.getUuid() ); statementBuilder.setValue( dataSet.getName() ); statementBuilder.setValue( dataSet.getShortName() ); statementBuilder.setValue( dataSet.getCode() ); === 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 2011-09-24 11:35:11 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -92,7 +92,6 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); statementBuilder.setColumn( "alternativename" ); statementBuilder.setColumn( "shortname" ); @@ -109,8 +108,7 @@ } protected void setValues( Indicator indicator ) - { - statementBuilder.setValue( indicator.getUuid() ); + { statementBuilder.setValue( indicator.getName() ); statementBuilder.setValue( indicator.getAlternativeName() ); statementBuilder.setValue( indicator.getShortName() ); === 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 2010-11-23 16:12:57 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -86,13 +86,11 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); } protected void setValues( IndicatorGroup group ) - { - statementBuilder.setValue( group.getUuid() ); + { statementBuilder.setValue( group.getName() ); } } === 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 2010-11-23 16:12:57 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -86,13 +86,11 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); } protected void setValues( IndicatorGroupSet groupSet ) - { - statementBuilder.setValue( groupSet.getUuid() ); + { statementBuilder.setValue( groupSet.getName() ); } } === 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 2011-04-22 21:04:14 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -90,7 +90,6 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); statementBuilder.setColumn( "parentid" ); statementBuilder.setColumn( "shortname" ); @@ -107,7 +106,6 @@ protected void setValues( OrganisationUnit unit ) { - statementBuilder.setValue( unit.getUuid() ); statementBuilder.setValue( unit.getName() ); statementBuilder.setValue( unit.getParent() != null ? unit.getParent().getId() : null ); statementBuilder.setValue( unit.getShortName() ); === 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 2010-11-23 16:12:57 +0000 +++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java 2011-11-22 15:48:30 +0000 @@ -86,13 +86,11 @@ protected void setColumns() { - statementBuilder.setColumn( "uuid" ); statementBuilder.setColumn( "name" ); } protected void setValues( OrganisationUnitGroup group ) - { - statementBuilder.setValue( group.getUuid() ); + { statementBuilder.setValue( group.getName() ); } } === modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java' --- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2011-11-12 18:43:35 +0000 +++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2011-11-22 15:48:30 +0000 @@ -104,8 +104,6 @@ */ public abstract class DhisConvenienceTest { - private static final String BASE_UUID = "C3C2E28D-9686-4634-93FD-BE3133935EC"; - private static final String BASE_UID = "123456789a"; private static final String EXT_TEST_DIR = System.getProperty( "user.home" ) + File.separator + "dhis2_test_dir"; @@ -340,7 +338,7 @@ { DataElement dataElement = new DataElement(); - dataElement.setUuid( BASE_UUID + uniqueCharacter ); + dataElement.setUid( BASE_UID + uniqueCharacter ); dataElement.setName( "DataElement" + uniqueCharacter ); dataElement.setAlternativeName( "DataElementAlternative" + uniqueCharacter ); dataElement.setShortName( "DataElementShort" + uniqueCharacter ); @@ -451,7 +449,7 @@ { DataElementGroup group = new DataElementGroup(); - group.setUuid( BASE_UUID + uniqueCharacter ); + group.setUid( BASE_UID + uniqueCharacter ); group.setName( "DataElementGroup" + uniqueCharacter ); return group; @@ -464,7 +462,7 @@ { DataElementGroupSet groupSet = new DataElementGroupSet(); - groupSet.setUuid( BASE_UUID + uniqueCharacter ); + groupSet.setUid( BASE_UID + uniqueCharacter ); groupSet.setName( "DataElementGroupSet" + uniqueCharacter ); return groupSet; @@ -505,7 +503,7 @@ { Indicator indicator = new Indicator(); - indicator.setUuid( BASE_UUID + uniqueCharacter ); + indicator.setUid( BASE_UID + uniqueCharacter ); indicator.setName( "Indicator" + uniqueCharacter ); indicator.setAlternativeName( "IndicatorAlternative" + uniqueCharacter ); indicator.setShortName( "IndicatorShort" + uniqueCharacter ); @@ -528,7 +526,7 @@ { IndicatorGroup group = new IndicatorGroup(); - group.setUuid( BASE_UUID + uniqueCharacter ); + group.setUid( BASE_UID + uniqueCharacter ); group.setName( "IndicatorGroup" + uniqueCharacter ); return group; @@ -541,7 +539,7 @@ { IndicatorGroupSet groupSet = new IndicatorGroupSet(); - groupSet.setUuid( BASE_UUID + uniqueCharacter ); + groupSet.setUid( BASE_UID + uniqueCharacter ); groupSet.setName( "IndicatorGroupSet" + uniqueCharacter ); return groupSet; @@ -570,7 +568,6 @@ { OrganisationUnit unit = new OrganisationUnit(); - unit.setUuid( BASE_UUID + uniqueCharacter ); unit.setUid( BASE_UID + uniqueCharacter ); unit.setName( "OrganisationUnit" + uniqueCharacter ); unit.setShortName( "OrganisationUnitShort" + uniqueCharacter ); @@ -605,7 +602,7 @@ { OrganisationUnitGroup group = new OrganisationUnitGroup(); - group.setUuid( BASE_UUID + uniqueCharacter ); + group.setUid( BASE_UID + uniqueCharacter ); group.setName( "OrganisationUnitGroup" + uniqueCharacter ); return group; === modified file 'dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/resources/DataSetsResource.java' --- dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/resources/DataSetsResource.java 2011-11-02 11:14:35 +0000 +++ dhis-2/dhis-web/dhis-web-api2/src/main/java/org/hisp/dhis/web/api2/resources/DataSetsResource.java 2011-11-22 15:48:30 +0000 @@ -82,8 +82,8 @@ for ( DataSet dataSet : dataSets ) { Map dataSetMap = new HashMap(); - dataSetMap.put( "id", dataSet.getUuid() ); - dataSetMap.put( "href", uriInfo.getAbsolutePath().toASCIIString() + "/" + dataSet.getUuid() ); + dataSetMap.put( "id", dataSet.getId() ); + dataSetMap.put( "href", uriInfo.getAbsolutePath().toASCIIString() + "/" + dataSet.getId() ); dataSetMap.put( "name", dataSet.getName() ); dataSetsArray.add( dataSetMap ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java 2011-10-05 10:06:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroupset/AddDataElementGroupSetAction.java 2011-11-22 15:48:30 +0000 @@ -33,7 +33,6 @@ import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dataelement.DataElementGroupSet; import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.system.util.UUIdUtils; import com.opensymphony.xwork2.Action; @@ -97,8 +96,6 @@ { DataElementGroupSet dataElementGroupSet = new DataElementGroupSet( name, description, compulsory ); - dataElementGroupSet.setUuid( UUIdUtils.getUUId() ); - List dataElementGroups = new ArrayList(); for ( String id : this.groupMembers ) === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java 2011-10-05 10:06:16 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatorgroupset/AddIndicatorGroupSetAction.java 2011-11-22 15:48:30 +0000 @@ -33,7 +33,6 @@ import org.hisp.dhis.indicator.IndicatorGroup; import org.hisp.dhis.indicator.IndicatorGroupSet; import org.hisp.dhis.indicator.IndicatorService; -import org.hisp.dhis.system.util.UUIdUtils; import com.opensymphony.xwork2.Action; @@ -95,8 +94,6 @@ { IndicatorGroupSet indicatorGroupSet = new IndicatorGroupSet( name, description, compulsory ); - indicatorGroupSet.setUuid( UUIdUtils.getUUId() ); - List indicatorGroups = new ArrayList(); for ( String id : this.groupMembers )