=== 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 2014-09-29 16:10:58 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java 2014-10-15 18:59:11 +0000 @@ -43,11 +43,6 @@ { final String[] I18N_PROPERTIES = { "name" }; - enum IdentifiableProperty - { - ID, UID, UUID, NAME, CODE - } - int getId(); String getUid(); === modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2014-09-09 07:32:11 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2014-10-15 18:59:11 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.common.NameableObject.NameableProperty; import java.util.Collection; === added file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableProperty.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableProperty.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableProperty.java 2014-10-15 18:59:11 +0000 @@ -0,0 +1,37 @@ +package org.hisp.dhis.common; + +/* + * Copyright (c) 2004-2014, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** + * @author Lars Helge Overland + */ +public enum IdentifiableProperty +{ + ID, UID, UUID, NAME, CODE; +} === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2014-09-09 07:32:11 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2014-10-15 18:59:11 +0000 @@ -30,7 +30,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.common.NameableObject.NameableProperty; import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; import org.springframework.beans.factory.annotation.Autowired; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java 2014-10-06 22:28:17 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSet.java 2014-10-15 18:59:11 +0000 @@ -35,7 +35,7 @@ import java.util.List; import org.hisp.dhis.common.DxfNamespaces; -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; import org.hisp.dhis.dxf2.datavalue.DataValue; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-10-13 17:59:47 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2014-10-15 18:59:11 +0000 @@ -30,7 +30,7 @@ import static com.google.common.collect.Sets.newHashSet; import static org.apache.commons.lang.StringUtils.trimToNull; -import static org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty.UUID; +import static org.hisp.dhis.common.IdentifiableProperty.UUID; import static org.hisp.dhis.system.notification.NotificationLevel.ERROR; import static org.hisp.dhis.system.notification.NotificationLevel.INFO; import static org.hisp.dhis.system.util.ConversionUtils.wrap; @@ -55,8 +55,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.common.DxfNamespaces; -import org.hisp.dhis.common.IdentifiableObject; -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.common.IdentifiableObjectManager; import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.dataelement.DataElement; @@ -385,7 +384,7 @@ complexNode.setComment( "Data element: " + label ); } - if ( IdentifiableObject.IdentifiableProperty.CODE.toString().toLowerCase() + if ( IdentifiableProperty.CODE.toString().toLowerCase() .equals( deScheme.toLowerCase() ) ) { SimpleNode simpleNode = complexNode.addChild( new SimpleNode( "dataElement", dataElement.getCode() ) ); @@ -405,7 +404,7 @@ if ( organisationUnit != null ) { - if ( IdentifiableObject.IdentifiableProperty.CODE.toString().toLowerCase().equals( ouScheme.toLowerCase() ) ) + if ( IdentifiableProperty.CODE.toString().toLowerCase().equals( ouScheme.toLowerCase() ) ) { simpleNode = complexNode.addChild( new SimpleNode( "orgUnit", organisationUnit.getCode() == null ? "" : organisationUnit.getCode() ) ); simpleNode.setAttribute( true ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-09 12:20:58 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2014-10-15 18:59:11 +0000 @@ -28,15 +28,25 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.google.common.cache.Cache; -import com.google.common.cache.CacheBuilder; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; import org.hisp.dhis.common.CodeGenerator; -import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.dxf2.events.trackedentity.TrackedEntityInstance; @@ -74,19 +84,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.TimeUnit; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; /** * @author Morten Olav Hansen @@ -950,19 +951,19 @@ } } - private OrganisationUnit getOrganisationUnit( IdentifiableObject.IdentifiableProperty scheme, String value ) + private OrganisationUnit getOrganisationUnit( IdentifiableProperty scheme, String value ) { OrganisationUnit organisationUnit = null; - if ( IdentifiableObject.IdentifiableProperty.UUID.equals( scheme ) ) + if ( IdentifiableProperty.UUID.equals( scheme ) ) { organisationUnit = organisationUnitService.getOrganisationUnitByUuid( value ); } - else if ( IdentifiableObject.IdentifiableProperty.CODE.equals( scheme ) ) + else if ( IdentifiableProperty.CODE.equals( scheme ) ) { organisationUnit = organisationUnitService.getOrganisationUnitByCode( value ); } - else if ( IdentifiableObject.IdentifiableProperty.NAME.equals( scheme ) ) + else if ( IdentifiableProperty.NAME.equals( scheme ) ) { List organisationUnitByName = organisationUnitService.getOrganisationUnitByName( value ); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2014-07-12 12:52:17 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java 2014-10-15 18:59:11 +0000 @@ -30,10 +30,12 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectManager; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dxf2.timer.SystemNanoTimer; import org.hisp.dhis.dxf2.timer.Timer; import org.hisp.dhis.period.PeriodStore; @@ -47,6 +49,7 @@ import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.PostConstruct; + import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -140,9 +143,9 @@ for ( Class type : registeredTypes ) { populateIdentifiableObjectMap( type ); - populateIdentifiableObjectMap( type, IdentifiableObject.IdentifiableProperty.UID ); - populateIdentifiableObjectMap( type, IdentifiableObject.IdentifiableProperty.CODE ); - populateIdentifiableObjectMap( type, IdentifiableObject.IdentifiableProperty.NAME ); + populateIdentifiableObjectMap( type, IdentifiableProperty.UID ); + populateIdentifiableObjectMap( type, IdentifiableProperty.CODE ); + populateIdentifiableObjectMap( type, IdentifiableProperty.NAME ); } timer.stop(); @@ -180,7 +183,7 @@ } @SuppressWarnings( "unchecked" ) - private void populateIdentifiableObjectMap( Class clazz, IdentifiableObject.IdentifiableProperty property ) + private void populateIdentifiableObjectMap( Class clazz, IdentifiableProperty property ) { Map map = new HashMap<>(); @@ -191,15 +194,15 @@ if ( !preheatCache || map != null ) { - if ( property == IdentifiableObject.IdentifiableProperty.UID ) + if ( property == IdentifiableProperty.UID ) { uidMap.put( (Class) clazz, map ); } - else if ( property == IdentifiableObject.IdentifiableProperty.CODE ) + else if ( property == IdentifiableProperty.CODE ) { codeMap.put( (Class) clazz, map ); } - else if ( property == IdentifiableObject.IdentifiableProperty.NAME ) + else if ( property == IdentifiableProperty.NAME ) { if ( !preheatCache ) { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportOptions.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportOptions.java 2014-09-12 15:26:18 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportOptions.java 2014-10-15 18:59:11 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; /** * @author Lars Helge Overland === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportOptions.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportOptions.java 2014-10-06 22:28:17 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportOptions.java 2014-10-15 18:59:11 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.importexport.ImportStrategy; /** === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java 2014-10-13 17:59:47 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java 2014-10-15 18:59:11 +0000 @@ -28,8 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty.CODE; -import static org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty.UID; +import static org.hisp.dhis.common.IdentifiableProperty.CODE; +import static org.hisp.dhis.common.IdentifiableProperty.UID; import static org.hisp.dhis.importexport.ImportStrategy.NEW_AND_UPDATES; import static org.hisp.dhis.importexport.ImportStrategy.UPDATES; import static org.junit.Assert.assertEquals; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/PdfFormController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/PdfFormController.java 2014-07-08 16:56:38 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/PdfFormController.java 2014-10-15 18:59:11 +0000 @@ -39,7 +39,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.metadata.ImportOptions; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java 2014-10-07 21:37:53 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java 2014-10-15 18:59:11 +0000 @@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.metadata.ExportOptions; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java 2014-10-15 18:59:11 +0000 @@ -31,7 +31,7 @@ import com.opensymphony.xwork2.Action; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.common.IdentifiableObject.IdentifiableProperty; +import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.metadata.ImportOptions; import org.hisp.dhis.importexport.ImportStrategy;