=== added directory 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common' === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/FilterOptions.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/FilterOptions.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/FilterOptions.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,63 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, 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 net.sf.json.JSONObject; + +/** + * @author Ovidiu Rosu + */ +public class FilterOptions + extends Options +{ + private JSONObject restrictionsJson; + + //-------------------------------------------------------------------------- + // Constructors + //-------------------------------------------------------------------------- + + public FilterOptions( JSONObject restrictionsJson ) + { + this.restrictionsJson = restrictionsJson; + } + + //-------------------------------------------------------------------------- + // Getters & Setters + //-------------------------------------------------------------------------- + + public JSONObject getRestrictionsJson() + { + return restrictionsJson; + } + + public void setRestrictionsJson( JSONObject restrictionsJson ) + { + this.restrictionsJson = restrictionsJson; + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/IdSchemes.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,145 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.common.IdentifiableProperty; + +/** + * @author Morten Olav Hansen + */ +public class IdSchemes +{ + private IdentifiableProperty idScheme; + + private IdentifiableProperty dataElementIdScheme = IdentifiableProperty.UID; + + private IdentifiableProperty categoryOptionComboIdScheme = IdentifiableProperty.UID; + + private IdentifiableProperty orgUnitIdScheme = IdentifiableProperty.UID; + + private IdentifiableProperty programIdScheme = IdentifiableProperty.UID; + + private IdentifiableProperty programStageIdScheme = IdentifiableProperty.UID; + + public IdSchemes() + { + } + + public IdentifiableProperty getIdScheme() + { + return idScheme; + } + + public IdentifiableProperty getIdentifiableProperty( IdentifiableProperty identifiableProperty ) + { + return idScheme != null ? idScheme : identifiableProperty; + } + + public void setIdScheme( IdentifiableProperty idScheme ) + { + this.idScheme = idScheme; + } + + public IdentifiableProperty getDataElementIdScheme() + { + return getIdentifiableProperty( dataElementIdScheme ); + } + + public void setDataElementIdScheme( IdentifiableProperty dataElementIdScheme ) + { + this.dataElementIdScheme = dataElementIdScheme; + } + + public IdentifiableProperty getCategoryOptionComboIdScheme() + { + return getIdentifiableProperty( categoryOptionComboIdScheme ); + } + + public void setCategoryOptionComboIdScheme( IdentifiableProperty categoryOptionComboIdScheme ) + { + this.categoryOptionComboIdScheme = categoryOptionComboIdScheme; + } + + public IdentifiableProperty getOrgUnitIdScheme() + { + return getIdentifiableProperty( orgUnitIdScheme ); + } + + public void setOrgUnitIdScheme( IdentifiableProperty orgUnitIdScheme ) + { + this.orgUnitIdScheme = orgUnitIdScheme; + } + + public IdentifiableProperty getProgramIdScheme() + { + return getIdentifiableProperty( programIdScheme ); + } + + public void setProgramIdScheme( IdentifiableProperty programIdScheme ) + { + this.programIdScheme = programIdScheme; + } + + public IdentifiableProperty getProgramStageIdScheme() + { + return getIdentifiableProperty( programStageIdScheme ); + } + + public void setProgramStageIdScheme( IdentifiableProperty programStageIdScheme ) + { + this.programStageIdScheme = programStageIdScheme; + } + + public static String getValue( String uid, String code, IdentifiableProperty identifiableProperty ) + { + boolean idScheme = IdentifiableProperty.ID.equals( identifiableProperty ) || IdentifiableProperty.UID.equals( identifiableProperty ); + return idScheme ? uid : code; + } + + public static String getValue( IdentifiableObject identifiableObject, IdentifiableProperty identifiableProperty ) + { + boolean idScheme = IdentifiableProperty.ID.equals( identifiableProperty ) || IdentifiableProperty.UID.equals( identifiableProperty ); + + if ( idScheme ) + { + return identifiableObject.getUid(); + } + else if ( IdentifiableProperty.CODE.equals( identifiableProperty ) ) + { + return identifiableObject.getCode(); + } + else if ( IdentifiableProperty.NAME.equals( identifiableProperty ) ) + { + return identifiableObject.getName(); + } + + return null; + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportOptions.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,226 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.common.IdentifiableProperty; +import org.hisp.dhis.common.MergeStrategy; +import org.hisp.dhis.importexport.ImportStrategy; + +/** + * The idScheme is a general setting which will apply to all objects. The idSchemes + * can also be defined for specific objects such as dataElementIdScheme. The + * general setting will override specific settings. + * + * @author Morten Olav Hansen + */ +public class ImportOptions +{ + private static final ImportOptions DEFAULT_OPTIONS = new ImportOptions( + IdentifiableProperty.UID, IdentifiableProperty.UID, false, true, ImportStrategy.NEW_AND_UPDATES, false ); + + private IdentifiableProperty idScheme; + + private IdentifiableProperty dataElementIdScheme; + + private IdentifiableProperty orgUnitIdScheme; + + private boolean dryRun; + + private boolean preheatCache = true; + + private boolean async; + + private ImportStrategy importStrategy; + + private MergeStrategy mergeStrategy = MergeStrategy.MERGE_IF_NOT_NULL; + + private boolean skipExistingCheck; + + private boolean sharing; + + //-------------------------------------------------------------------------- + // Constructors + //-------------------------------------------------------------------------- + + public ImportOptions() + { + } + + public ImportOptions( ImportStrategy importStrategy ) + { + this.importStrategy = importStrategy; + } + + public ImportOptions( IdentifiableProperty dataElementIdScheme, IdentifiableProperty orgUnitIdScheme, + boolean dryRun, boolean preheatCache, ImportStrategy importStrategy, boolean skipExistingCheck ) + { + this.dataElementIdScheme = dataElementIdScheme; + this.orgUnitIdScheme = orgUnitIdScheme; + this.preheatCache = preheatCache; + this.dryRun = dryRun; + this.importStrategy = importStrategy; + this.skipExistingCheck = skipExistingCheck; + } + + public ImportOptions( IdentifiableProperty idScheme, IdentifiableProperty dataElementIdScheme, IdentifiableProperty orgUnitIdScheme, + boolean dryRun, boolean preheatCache, ImportStrategy importStrategy, boolean skipExistingCheck ) + { + this.idScheme = idScheme; + this.dataElementIdScheme = dataElementIdScheme; + this.orgUnitIdScheme = orgUnitIdScheme; + this.preheatCache = preheatCache; + this.dryRun = dryRun; + this.importStrategy = importStrategy; + this.skipExistingCheck = skipExistingCheck; + } + + //-------------------------------------------------------------------------- + // Logic + //-------------------------------------------------------------------------- + + public static ImportOptions getDefaultImportOptions() + { + return DEFAULT_OPTIONS; + } + + //-------------------------------------------------------------------------- + // Get methods + //-------------------------------------------------------------------------- + + public IdentifiableProperty getIdScheme() + { + return idScheme != null ? idScheme : IdentifiableProperty.UID; + } + + public IdentifiableProperty getDataElementIdScheme() + { + return dataElementIdScheme != null ? dataElementIdScheme : (idScheme != null ? idScheme : IdentifiableProperty.UID); + } + + public IdentifiableProperty getOrgUnitIdScheme() + { + return orgUnitIdScheme != null ? orgUnitIdScheme : (idScheme != null ? idScheme : IdentifiableProperty.UID); + } + + public boolean isDryRun() + { + return dryRun; + } + + public boolean isPreheatCache() + { + return preheatCache; + } + + public ImportStrategy getImportStrategy() + { + return importStrategy != null ? importStrategy : ImportStrategy.NEW_AND_UPDATES; + } + + public MergeStrategy getMergeStrategy() + { + return mergeStrategy; + } + + public boolean isSkipExistingCheck() + { + return skipExistingCheck; + } + + //-------------------------------------------------------------------------- + // Set methods + //-------------------------------------------------------------------------- + + public void setIdScheme( String scheme ) + { + this.idScheme = scheme != null ? IdentifiableProperty.valueOf( scheme.toUpperCase() ) : null; + } + + public void setDataElementIdScheme( String scheme ) + { + this.dataElementIdScheme = scheme != null ? IdentifiableProperty.valueOf( scheme.toUpperCase() ) : null; + } + + public void setOrgUnitIdScheme( String scheme ) + { + this.orgUnitIdScheme = scheme != null ? IdentifiableProperty.valueOf( scheme.toUpperCase() ) : null; + } + + public void setDryRun( boolean dryRun ) + { + this.dryRun = dryRun; + } + + public void setPreheatCache( boolean preheatCache ) + { + this.preheatCache = preheatCache; + } + + public boolean isAsync() + { + return async; + } + + public void setAsync( boolean async ) + { + this.async = async; + } + + public void setStrategy( String strategy ) + { + this.importStrategy = strategy != null ? ImportStrategy.valueOf( strategy.toUpperCase() ) : null; + } + + public void setImportStrategy( String strategy ) + { + this.importStrategy = strategy != null ? ImportStrategy.valueOf( strategy.toUpperCase() ) : null; + } + + public void setSkipExistingCheck( boolean skipExistingCheck ) + { + this.skipExistingCheck = skipExistingCheck; + } + + public boolean isSharing() + { + return sharing; + } + + public void setSharing( boolean sharing ) + { + this.sharing = sharing; + } + + @Override + public String toString() + { + return "[Id scheme: " + idScheme + ", data element id scheme: " + dataElementIdScheme + ", org unit id scheme: " + + orgUnitIdScheme + ", dry run: " + dryRun + ", async: " + async + ", strategy: " + importStrategy + ", skip check: " + skipExistingCheck + "]"; + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportSummaryResponseExtractor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportSummaryResponseExtractor.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportSummaryResponseExtractor.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,65 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, 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.io.IOException; + +import org.hisp.dhis.dxf2.importsummary.ImportSummary; +import org.springframework.http.HttpStatus; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.web.client.HttpServerErrorException; +import org.springframework.web.client.ResponseExtractor; + +/** + * Converts a response into an ImportSummary instance. + * + * @throws HttpServerErrorException if the response status code is different + * from 200 OK or 201 Created. + * @throws IOException if converting the response into an ImportSummary failed. + * + * @author Lars Helge Overland + */ +public class ImportSummaryResponseExtractor + implements ResponseExtractor +{ + @Override + public ImportSummary extractData( ClientHttpResponse response ) throws IOException + { + ImportSummary summary = JacksonUtils.fromJson( response.getBody(), ImportSummary.class ); + + HttpStatus status = response.getStatusCode(); + + if ( !( HttpStatus.CREATED.equals( status ) || HttpStatus.OK.equals( status ) ) ) + { + throw new HttpServerErrorException( status, "Data synch failed on remote server" ); + } + + return summary; + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportUtils.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/ImportUtils.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,68 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.common.IdentifiableObject; + +/** + * @author Morten Olav Hansen + */ +public class ImportUtils +{ + /** + * @param object Object to get display name for + * @return A usable display name + */ + public static String getDisplayName( Object object ) + { + if ( object == null ) + { + return "[ object is null ]"; + } + else if ( IdentifiableObject.class.isInstance( object ) ) + { + IdentifiableObject identifiableObject = (IdentifiableObject) object; + + if ( identifiableObject.getName() != null && identifiableObject.getName().length() > 0 ) + { + return identifiableObject.getName(); + } + else if ( identifiableObject.getUid() != null && identifiableObject.getUid().length() > 0 ) + { + return identifiableObject.getUid(); + } + else if ( identifiableObject.getCode() != null && identifiableObject.getCode().length() > 0 ) + { + return identifiableObject.getCode(); + } + } + + return object.getClass().getName(); + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/JacksonUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/JacksonUtils.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/JacksonUtils.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,228 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, 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 com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; +import org.hisp.dhis.common.view.BasicView; +import org.hisp.dhis.common.view.DetailedView; +import org.hisp.dhis.common.view.DimensionalView; +import org.hisp.dhis.common.view.ExportView; +import org.hisp.dhis.common.view.SharingBasicView; +import org.hisp.dhis.common.view.SharingDetailedView; +import org.hisp.dhis.common.view.SharingExportView; +import org.hisp.dhis.common.view.ShortNameView; +import org.hisp.dhis.common.view.UuidView; +import org.hisp.dhis.common.view.WithoutOrganisationUnitsView; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Morten Olav Hansen + */ +public class JacksonUtils +{ + private final static ObjectMapper jsonMapper = new ObjectMapper(); + + private final static XmlMapper xmlMapper = new XmlMapper(); + + private final static Map> viewClasses = new HashMap<>(); + + static + { + ObjectMapper[] objectMappers = new ObjectMapper[]{ jsonMapper, xmlMapper }; + // DateFormat format = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssZ" ); + + for ( ObjectMapper objectMapper : objectMappers ) + { + // objectMapper.setDateFormat( format ); + objectMapper.setSerializationInclusion( JsonInclude.Include.NON_NULL ); + objectMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false ); + objectMapper.configure( SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false ); + objectMapper.configure( SerializationFeature.FAIL_ON_EMPTY_BEANS, false ); + objectMapper.configure( SerializationFeature.WRAP_EXCEPTIONS, true ); + + objectMapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false ); + objectMapper.configure( DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true ); + objectMapper.configure( DeserializationFeature.WRAP_EXCEPTIONS, true ); + + objectMapper.disable( MapperFeature.AUTO_DETECT_FIELDS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_CREATORS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_GETTERS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_SETTERS ); + objectMapper.disable( MapperFeature.AUTO_DETECT_IS_GETTERS ); + } + + jsonMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES ); + xmlMapper.configure( ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true ); + + // Register view classes + + viewClasses.put( "default", BasicView.class ); + viewClasses.put( "basic", BasicView.class ); + viewClasses.put( "sharing", SharingBasicView.class ); + viewClasses.put( "sharingBasic", SharingBasicView.class ); + viewClasses.put( "shortName", ShortNameView.class ); + viewClasses.put( "detailed", DetailedView.class ); + viewClasses.put( "sharingDetailed", SharingDetailedView.class ); + viewClasses.put( "uuid", UuidView.class ); + viewClasses.put( "export", ExportView.class ); + viewClasses.put( "sharingExport", SharingExportView.class ); + viewClasses.put( "dimensional", DimensionalView.class ); + viewClasses.put( "withoutOrganisationUnits", WithoutOrganisationUnitsView.class ); + } + + /** + * TODO remove + */ + public static Class getViewClass( Object viewName ) + { + if ( viewName == null || !(viewName instanceof String && ((String) viewName).length() != 0) ) + { + return viewClasses.get( "default" ); + } + + return viewClasses.get( viewName ); + } + + //-------------------------------------------------------------------------- + // Global pre-configured instances of ObjectMapper and XmlMapper + //-------------------------------------------------------------------------- + + public static ObjectMapper getJsonMapper() + { + return jsonMapper; + } + + public static XmlMapper getXmlMapper() + { + return xmlMapper; + } + + //-------------------------------------------------------------------------- + // JSON + //-------------------------------------------------------------------------- + + public static void toJson( OutputStream output, Object value ) throws IOException + { + jsonMapper.writeValue( output, value ); + } + + public static String toJsonAsString( Object value ) throws IOException + { + return jsonMapper.writeValueAsString( value ); + } + + /** + * TODO remove + */ + public static void toJsonWithView( OutputStream output, Object value, Class viewClass ) throws IOException + { + jsonMapper.writerWithView( viewClass ).writeValue( output, value ); + } + + /** + * TODO remove + */ + public static String toJsonWithViewAsString( Object value, Class viewClass ) throws IOException + { + return jsonMapper.writerWithView( viewClass ).writeValueAsString( value ); + } + + @SuppressWarnings( "unchecked" ) + public static T fromJson( InputStream input, Class clazz ) throws IOException + { + return (T) jsonMapper.readValue( input, clazz ); + } + + @SuppressWarnings( "unchecked" ) + public static T fromJson( String input, Class clazz ) throws IOException + { + return (T) jsonMapper.readValue( input, clazz ); + } + + //-------------------------------------------------------------------------- + // XML + //-------------------------------------------------------------------------- + + public static void toXml( OutputStream output, Object value ) throws IOException + { + xmlMapper.writeValue( output, value ); + } + + public static String toXmlAsString( Object value ) throws IOException + { + return xmlMapper.writeValueAsString( value ); + } + + /** + * TODO remove + */ + public static void toXmlWithView( OutputStream output, Object value, Class viewClass ) throws IOException + { + xmlMapper.writerWithView( viewClass ).writeValue( output, value ); + } + + /** + * TODO remove + */ + public static String toXmlWithViewAsString( Object value, Class viewClass ) throws IOException + { + return xmlMapper.writerWithView( viewClass ).writeValueAsString( value ); + } + + @SuppressWarnings( "unchecked" ) + public static T fromXml( InputStream input, Class clazz ) throws IOException + { + return (T) xmlMapper.readValue( input, clazz ); + } + + @SuppressWarnings( "unchecked" ) + public static T fromXml( String input, Class clazz ) throws IOException + { + return (T) xmlMapper.readValue( input, clazz ); + } + + @SuppressWarnings( "unchecked" ) + public static T fromJson( InputStream inputStream, TypeReference typeReference ) throws IOException + { + return (T) jsonMapper.readValue( inputStream, typeReference ); + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/Options.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/Options.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/Options.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,273 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, 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.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Morten Olav Hansen + */ +public class Options +{ + //-------------------------------------------------------------------------- + // Static helpers + //-------------------------------------------------------------------------- + + protected static String stringAsString( String str, String defaultValue ) + { + if ( str == null ) + { + str = defaultValue; + } + + return str; + } + + public static Date stringAsDate( String str ) + { + if ( str == null ) + { + return null; + } + + String patterns[] = new String[]{ + "yyyy-MM-dd", + "yyyy-MM", + "yyyyMMdd", + "yyyyMM", + "yyyy" + }; + + for ( String pattern : patterns ) + { + Date date = getDateByPattern( str, pattern ); + + if ( date != null ) + { + return date; + } + } + + return null; + } + + protected static Date getDateByPattern( String str, String pattern ) + { + if ( str != null ) + { + try + { + return new SimpleDateFormat( pattern ).parse( str ); + } + catch ( ParseException ignored ) + { + } + } + + return null; + } + + protected static boolean stringAsBoolean( String str, boolean defaultValue ) + { + return str != null ? Boolean.parseBoolean( str ) : defaultValue; + } + + protected static boolean stringIsTrue( String str ) + { + return stringAsBoolean( str, false ); + } + + protected static int stringAsInt( String str ) + { + return stringAsInt( str, 0 ); + } + + protected static int stringAsInt( String str, int defaultValue ) + { + if ( str != null ) + { + try + { + return Integer.parseInt( str ); + } + catch ( NumberFormatException ignored ) + { + } + } + + return defaultValue; + } + + //-------------------------------------------------------------------------- + // Internal State + //-------------------------------------------------------------------------- + + protected Map options = new HashMap<>(); + + protected boolean assumeTrue; + + //-------------------------------------------------------------------------- + // Constructors + //-------------------------------------------------------------------------- + + public Options( Map options ) + { + this.options = options; + this.assumeTrue = options.get( "assumeTrue" ) == null || options.get( "assumeTrue" ).equalsIgnoreCase( "true" ); + } + + public Options() + { + } + + //-------------------------------------------------------------------------- + // Object helpers + //-------------------------------------------------------------------------- + + /** + * Indicates whether the given object type is enabled. Takes the assumeTrue + * parameter into account. + */ + public boolean isEnabled( String type ) + { + String enabled = options.get( type ); + + return stringIsTrue( enabled ) || (enabled == null && assumeTrue); + } + + /** + * Indicates whether the given object type is disabled. Takes the assumeTrue + * parameter into account. + */ + public boolean isDisabled( String type ) + { + return !isEnabled( type ); + } + + //-------------------------------------------------------------------------- + // Options helpers + //-------------------------------------------------------------------------- + + public Date getDate( String key ) + { + return stringAsDate( options.get( key ) ); + } + + /** + * Indicates whether the options contains the given parameter key. + */ + public boolean contains( String key ) + { + return options.containsKey( key ); + } + + /** + * Indicates whether the options contains a non-null option value for the given + * parameter key. + */ + public boolean containsValue( String key ) + { + return options.get( key ) != null; + } + + /** + * Returns the option value for the given parameter key. + */ + public String get( String key ) + { + return options.get( key ); + } + + /** + * Returns the option value for the given parameter key as in Integer. + */ + public Integer getInt( String key ) + { + return options.containsKey( key ) ? Integer.parseInt( options.get( key ) ) : null; + } + + /** + * Indicates whether the option value for the parameter key is true. + */ + public boolean isTrue( String key ) + { + return options.containsKey( key ) && Boolean.parseBoolean( options.get( key ) ); + } + + //-------------------------------------------------------------------------- + // Getters and Setters + //-------------------------------------------------------------------------- + + public Map getOptions() + { + return options; + } + + public void setOptions( Map options ) + { + this.options = options; + } + + public boolean isAssumeTrue() + { + return assumeTrue; + } + + public void setAssumeTrue( boolean assumeTrue ) + { + this.assumeTrue = assumeTrue; + } + + //-------------------------------------------------------------------------- + // Getters for standard options + //-------------------------------------------------------------------------- + + public Date getLastUpdated() + { + return getDate( "lastUpdated" ); + } + + //-------------------------------------------------------------------------- + // Adding options + //-------------------------------------------------------------------------- + + public void addOption( String option, String value ) + { + options.put( option, value ); + } + + public void addOptions( Map newOptions ) + { + options.putAll( options ); + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrganisationUnitUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrganisationUnitUtils.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/OrganisationUnitUtils.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,106 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.hisp.dhis.organisationunit.OrganisationUnit; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; + +/** + * @author Morten Olav Hansen + */ +public class OrganisationUnitUtils +{ + private static Map getOrganisationUnitMap( Collection organisationUnits ) + { + Map organisationUnitMap = new HashMap<>(); + + for ( OrganisationUnit organisationUnit : organisationUnits ) + { + if ( organisationUnit.getUid() != null ) + { + organisationUnitMap.put( organisationUnit.getUid(), organisationUnit ); + } + + if ( organisationUnit.getCode() != null ) + { + organisationUnitMap.put( organisationUnit.getCode(), organisationUnit ); + } + + if ( organisationUnit.getName() != null ) + { + organisationUnitMap.put( organisationUnit.getName(), organisationUnit ); + } + + if ( organisationUnit.getShortName() != null ) + { + organisationUnitMap.put( organisationUnit.getShortName(), organisationUnit ); + } + } + + return organisationUnitMap; + } + + public static void updateParents( Collection organisationUnits ) + { + Map organisationUnitMap = getOrganisationUnitMap( organisationUnits ); + + for ( OrganisationUnit organisationUnit : organisationUnits ) + { + OrganisationUnit parent = organisationUnit.getParent(); + + if ( parent != null ) + { + if ( parent.getUid() != null ) + { + parent = organisationUnitMap.get( parent.getUid() ); + } + else if ( parent.getCode() != null ) + { + parent = organisationUnitMap.get( parent.getCode() ); + } + else if ( parent.getName() != null ) + { + parent = organisationUnitMap.get( parent.getName() ); + } + else if ( parent.getShortName() != null ) + { + parent = organisationUnitMap.get( parent.getShortName() ); + } + } + + if ( parent != null ) + { + organisationUnit.setParent( parent ); + } + } + } +} === added file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/TranslateOptions.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/TranslateOptions.java 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/common/TranslateOptions.java 2015-02-17 06:00:52 +0000 @@ -0,0 +1,72 @@ +package org.hisp.dhis.dxf2.common; + +/* + * Copyright (c) 2004-2015, University of Oslo + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * Neither the name of the HISP project nor the names of its contributors may + * be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +import org.springframework.util.StringUtils; + +import java.util.Locale; + +/** + * @author Morten Olav Hansen + */ +public class TranslateOptions +{ + private boolean translate; + + private String locale; + + public TranslateOptions() + { + } + + public boolean isTranslate() + { + return translate || !StringUtils.isEmpty( locale ); + } + + public void setTranslate( boolean translate ) + { + this.translate = translate; + } + + public Locale getLocale() + { + return Locale.forLanguageTag( locale ); + } + + public void setLocale( String locale ) + { + this.locale = locale; + } + + public boolean defaultLocale() + { + return StringUtils.isEmpty( locale ); + } +} === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java 2015-02-16 09:43:40 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetService.java 2015-02-17 06:00:52 +0000 @@ -30,8 +30,8 @@ import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.metadata.ImportOptions; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.ImportOptions; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.node.types.RootNode; import org.hisp.dhis.period.Period; import org.hisp.dhis.scheduling.TaskId; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java 2015-02-16 09:43:40 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetStore.java 2015-02-17 06:00:52 +0000 @@ -29,7 +29,7 @@ */ import org.hisp.dhis.dataset.DataSet; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; === 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 2015-02-16 09:43:40 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/DefaultDataValueSetService.java 2015-02-17 06:00:52 +0000 @@ -50,10 +50,10 @@ import org.hisp.dhis.dxf2.importsummary.ImportCount; import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.pdfform.PdfDataEntryFormUtil; -import org.hisp.dhis.dxf2.utils.IdSchemes; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.IdSchemes; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.importexport.ImportStrategy; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2015-02-16 09:43:40 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/SpringDataValueSetStore.java 2015-02-17 06:00:52 +0000 @@ -34,7 +34,7 @@ import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dxf2.datavalue.DataValue; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.period.Period; import org.hisp.dhis.period.PeriodType; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingJsonDataValueSet.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingJsonDataValueSet.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/datavalueset/StreamingJsonDataValueSet.java 2015-02-17 06:00:52 +0000 @@ -31,7 +31,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import org.hisp.dhis.dxf2.datavalue.DataValue; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import java.io.IOException; import java.io.OutputStream; === 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 2015-02-16 08:37:44 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java 2015-02-17 06:00:52 +0000 @@ -42,8 +42,8 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.metadata.ImportOptions; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.ImportOptions; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.organisationunit.OrganisationUnit; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java 2015-02-16 08:37:44 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventService.java 2015-02-17 06:00:52 +0000 @@ -28,12 +28,11 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dxf2.events.trackedentity.TrackedEntityInstance; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.metadata.ImportOptions; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.ImportOptions; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.program.Program; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java 2015-02-16 08:37:44 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/EventStore.java 2015-02-17 06:00:52 +0000 @@ -28,9 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dxf2.events.trackedentity.TrackedEntityInstance; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.program.Program; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventTask.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventTask.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventTask.java 2015-02-17 06:00:52 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.scheduling.TaskId; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventsTask.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventsTask.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/ImportEventsTask.java 2015-02-17 06:00:52 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.scheduling.TaskId; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JacksonEventService.java 2015-02-17 06:00:52 +0000 @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.scheduling.TaskId; import org.hisp.dhis.system.notification.NotificationLevel; import org.hisp.dhis.system.timer.SystemTimer; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2015-02-16 08:37:44 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/JdbcEventStore.java 2015-02-17 06:00:52 +0000 @@ -33,9 +33,8 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dxf2.events.trackedentity.TrackedEntityInstance; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.program.Program; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java 2015-02-05 06:53:38 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/DefaultGmlImportService.java 2015-02-17 06:00:52 +0000 @@ -31,7 +31,7 @@ import com.google.common.base.Function; import com.google.common.collect.Maps; import org.hisp.dhis.common.MergeStrategy; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.MetaData; import org.hisp.dhis.dxf2.render.RenderService; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/GmlImportService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/GmlImportService.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/gml/GmlImportService.java 2015-02-17 06:00:52 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.MetaData; import org.hisp.dhis.scheduling.TaskId; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultExportService.java 2015-02-17 06:00:52 +0000 @@ -35,6 +35,8 @@ import org.apache.commons.logging.LogFactory; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectManager; +import org.hisp.dhis.dxf2.common.FilterOptions; +import org.hisp.dhis.dxf2.common.Options; import org.hisp.dhis.filter.MetaDataFilter; import org.hisp.dhis.filter.MetaDataFilterService; import org.hisp.dhis.scheduling.TaskId; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultImportService.java 2015-02-17 06:00:52 +0000 @@ -33,6 +33,7 @@ import org.hibernate.SessionFactory; import org.hisp.dhis.cache.HibernateCacheManager; import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.system.timer.SystemTimer; import org.hisp.dhis.system.timer.Timer; import org.hisp.dhis.importexport.ImportStrategy; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ExportService.java 2015-02-17 06:00:52 +0000 @@ -29,6 +29,8 @@ */ import net.sf.json.JSONObject; +import org.hisp.dhis.dxf2.common.FilterOptions; +import org.hisp.dhis.dxf2.common.Options; import org.hisp.dhis.filter.MetaDataFilter; import org.hisp.dhis.scheduling.TaskId; === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/FilterOptions.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/FilterOptions.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/FilterOptions.java 1970-01-01 00:00:00 +0000 @@ -1,63 +0,0 @@ -package org.hisp.dhis.dxf2.metadata; - -/* - * Copyright (c) 2004-2015, 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 net.sf.json.JSONObject; - -/** - * @author Ovidiu Rosu - */ -public class FilterOptions - extends Options -{ - private JSONObject restrictionsJson; - - //-------------------------------------------------------------------------- - // Constructors - //-------------------------------------------------------------------------- - - public FilterOptions( JSONObject restrictionsJson ) - { - this.restrictionsJson = restrictionsJson; - } - - //-------------------------------------------------------------------------- - // Getters & Setters - //-------------------------------------------------------------------------- - - public JSONObject getRestrictionsJson() - { - return restrictionsJson; - } - - public void setRestrictionsJson( JSONObject restrictionsJson ) - { - this.restrictionsJson = restrictionsJson; - } -} === removed 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 2015-02-05 07:52:28 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportOptions.java 1970-01-01 00:00:00 +0000 @@ -1,226 +0,0 @@ -package org.hisp.dhis.dxf2.metadata; - -/* - * Copyright (c) 2004-2015, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.hisp.dhis.common.IdentifiableProperty; -import org.hisp.dhis.common.MergeStrategy; -import org.hisp.dhis.importexport.ImportStrategy; - -/** - * The idScheme is a general setting which will apply to all objects. The idSchemes - * can also be defined for specific objects such as dataElementIdScheme. The - * general setting will override specific settings. - * - * @author Morten Olav Hansen - */ -public class ImportOptions -{ - private static final ImportOptions DEFAULT_OPTIONS = new ImportOptions( - IdentifiableProperty.UID, IdentifiableProperty.UID, false, true, ImportStrategy.NEW_AND_UPDATES, false ); - - private IdentifiableProperty idScheme; - - private IdentifiableProperty dataElementIdScheme; - - private IdentifiableProperty orgUnitIdScheme; - - private boolean dryRun; - - private boolean preheatCache = true; - - private boolean async; - - private ImportStrategy importStrategy; - - private MergeStrategy mergeStrategy = MergeStrategy.MERGE_IF_NOT_NULL; - - private boolean skipExistingCheck; - - private boolean sharing; - - //-------------------------------------------------------------------------- - // Constructors - //-------------------------------------------------------------------------- - - public ImportOptions() - { - } - - public ImportOptions( ImportStrategy importStrategy ) - { - this.importStrategy = importStrategy; - } - - public ImportOptions( IdentifiableProperty dataElementIdScheme, IdentifiableProperty orgUnitIdScheme, - boolean dryRun, boolean preheatCache, ImportStrategy importStrategy, boolean skipExistingCheck ) - { - this.dataElementIdScheme = dataElementIdScheme; - this.orgUnitIdScheme = orgUnitIdScheme; - this.preheatCache = preheatCache; - this.dryRun = dryRun; - this.importStrategy = importStrategy; - this.skipExistingCheck = skipExistingCheck; - } - - public ImportOptions( IdentifiableProperty idScheme, IdentifiableProperty dataElementIdScheme, IdentifiableProperty orgUnitIdScheme, - boolean dryRun, boolean preheatCache, ImportStrategy importStrategy, boolean skipExistingCheck ) - { - this.idScheme = idScheme; - this.dataElementIdScheme = dataElementIdScheme; - this.orgUnitIdScheme = orgUnitIdScheme; - this.preheatCache = preheatCache; - this.dryRun = dryRun; - this.importStrategy = importStrategy; - this.skipExistingCheck = skipExistingCheck; - } - - //-------------------------------------------------------------------------- - // Logic - //-------------------------------------------------------------------------- - - public static ImportOptions getDefaultImportOptions() - { - return DEFAULT_OPTIONS; - } - - //-------------------------------------------------------------------------- - // Get methods - //-------------------------------------------------------------------------- - - public IdentifiableProperty getIdScheme() - { - return idScheme != null ? idScheme : IdentifiableProperty.UID; - } - - public IdentifiableProperty getDataElementIdScheme() - { - return dataElementIdScheme != null ? dataElementIdScheme : (idScheme != null ? idScheme : IdentifiableProperty.UID); - } - - public IdentifiableProperty getOrgUnitIdScheme() - { - return orgUnitIdScheme != null ? orgUnitIdScheme : (idScheme != null ? idScheme : IdentifiableProperty.UID); - } - - public boolean isDryRun() - { - return dryRun; - } - - public boolean isPreheatCache() - { - return preheatCache; - } - - public ImportStrategy getImportStrategy() - { - return importStrategy != null ? importStrategy : ImportStrategy.NEW_AND_UPDATES; - } - - public MergeStrategy getMergeStrategy() - { - return mergeStrategy; - } - - public boolean isSkipExistingCheck() - { - return skipExistingCheck; - } - - //-------------------------------------------------------------------------- - // Set methods - //-------------------------------------------------------------------------- - - public void setIdScheme( String scheme ) - { - this.idScheme = scheme != null ? IdentifiableProperty.valueOf( scheme.toUpperCase() ) : null; - } - - public void setDataElementIdScheme( String scheme ) - { - this.dataElementIdScheme = scheme != null ? IdentifiableProperty.valueOf( scheme.toUpperCase() ) : null; - } - - public void setOrgUnitIdScheme( String scheme ) - { - this.orgUnitIdScheme = scheme != null ? IdentifiableProperty.valueOf( scheme.toUpperCase() ) : null; - } - - public void setDryRun( boolean dryRun ) - { - this.dryRun = dryRun; - } - - public void setPreheatCache( boolean preheatCache ) - { - this.preheatCache = preheatCache; - } - - public boolean isAsync() - { - return async; - } - - public void setAsync( boolean async ) - { - this.async = async; - } - - public void setStrategy( String strategy ) - { - this.importStrategy = strategy != null ? ImportStrategy.valueOf( strategy.toUpperCase() ) : null; - } - - public void setImportStrategy( String strategy ) - { - this.importStrategy = strategy != null ? ImportStrategy.valueOf( strategy.toUpperCase() ) : null; - } - - public void setSkipExistingCheck( boolean skipExistingCheck ) - { - this.skipExistingCheck = skipExistingCheck; - } - - public boolean isSharing() - { - return sharing; - } - - public void setSharing( boolean sharing ) - { - this.sharing = sharing; - } - - @Override - public String toString() - { - return "[Id scheme: " + idScheme + ", data element id scheme: " + dataElementIdScheme + ", org unit id scheme: " + - orgUnitIdScheme + ", dry run: " + dryRun + ", async: " + async + ", strategy: " + importStrategy + ", skip check: " + skipExistingCheck + "]"; - } -} === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportService.java 2015-02-17 06:00:52 +0000 @@ -29,6 +29,7 @@ */ import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.scheduling.TaskId; import org.springframework.stereotype.Service; === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportUtils.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportUtils.java 1970-01-01 00:00:00 +0000 @@ -1,68 +0,0 @@ -package org.hisp.dhis.dxf2.metadata; - -/* - * Copyright (c) 2004-2015, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.hisp.dhis.common.IdentifiableObject; - -/** - * @author Morten Olav Hansen - */ -public class ImportUtils -{ - /** - * @param object Object to get display name for - * @return A usable display name - */ - public static String getDisplayName( Object object ) - { - if ( object == null ) - { - return "[ object is null ]"; - } - else if ( IdentifiableObject.class.isInstance( object ) ) - { - IdentifiableObject identifiableObject = (IdentifiableObject) object; - - if ( identifiableObject.getName() != null && identifiableObject.getName().length() > 0 ) - { - return identifiableObject.getName(); - } - else if ( identifiableObject.getUid() != null && identifiableObject.getUid().length() > 0 ) - { - return identifiableObject.getUid(); - } - else if ( identifiableObject.getCode() != null && identifiableObject.getCode().length() > 0 ) - { - return identifiableObject.getCode(); - } - } - - return object.getClass().getName(); - } -} === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Importer.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Importer.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Importer.java 2015-02-17 06:00:52 +0000 @@ -28,6 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.user.User; import java.util.List; === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java 2015-02-16 03:56:25 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/Options.java 1970-01-01 00:00:00 +0000 @@ -1,276 +0,0 @@ -package org.hisp.dhis.dxf2.metadata; - -/* - * Copyright (c) 2004-2015, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.springframework.util.StringUtils; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -/** - * @author Morten Olav Hansen - */ -public class Options -{ - //-------------------------------------------------------------------------- - // Static helpers - //-------------------------------------------------------------------------- - - protected static String stringAsString( String str, String defaultValue ) - { - if ( str == null ) - { - str = defaultValue; - } - - return str; - } - - public static Date stringAsDate( String str ) - { - if ( str == null ) - { - return null; - } - - String patterns[] = new String[]{ - "yyyy-MM-dd", - "yyyy-MM", - "yyyyMMdd", - "yyyyMM", - "yyyy" - }; - - for ( String pattern : patterns ) - { - Date date = getDateByPattern( str, pattern ); - - if ( date != null ) - { - return date; - } - } - - return null; - } - - protected static Date getDateByPattern( String str, String pattern ) - { - if ( str != null ) - { - try - { - return new SimpleDateFormat( pattern ).parse( str ); - } - catch ( ParseException ignored ) - { - } - } - - return null; - } - - protected static boolean stringAsBoolean( String str, boolean defaultValue ) - { - return str != null ? Boolean.parseBoolean( str ) : defaultValue; - } - - protected static boolean stringIsTrue( String str ) - { - return stringAsBoolean( str, false ); - } - - protected static int stringAsInt( String str ) - { - return stringAsInt( str, 0 ); - } - - protected static int stringAsInt( String str, int defaultValue ) - { - if ( str != null ) - { - try - { - return Integer.parseInt( str ); - } - catch ( NumberFormatException ignored ) - { - } - } - - return defaultValue; - } - - //-------------------------------------------------------------------------- - // Internal State - //-------------------------------------------------------------------------- - - protected Map options = new HashMap<>(); - - protected boolean assumeTrue; - - //-------------------------------------------------------------------------- - // Constructors - //-------------------------------------------------------------------------- - - public Options( Map options ) - { - this.options = options; - this.assumeTrue = options.get( "assumeTrue" ) == null || options.get( "assumeTrue" ).equalsIgnoreCase( "true" ); - } - - public Options() - { - } - - //-------------------------------------------------------------------------- - // Object helpers - //-------------------------------------------------------------------------- - - /** - * Indicates whether the given object type is enabled. Takes the assumeTrue - * parameter into account. - */ - public boolean isEnabled( String type ) - { - String enabled = options.get( type ); - - return stringIsTrue( enabled ) || (enabled == null && assumeTrue); - } - - /** - * Indicates whether the given object type is disabled. Takes the assumeTrue - * parameter into account. - */ - public boolean isDisabled( String type ) - { - return !isEnabled( type ); - } - - //-------------------------------------------------------------------------- - // Options helpers - //-------------------------------------------------------------------------- - - public Date getDate( String key ) - { - return stringAsDate( options.get( key ) ); - } - - /** - * Indicates whether the options contains the given parameter key. - */ - public boolean contains( String key ) - { - return options.containsKey( key ); - } - - /** - * Indicates whether the options contains a non-null option value for the given - * parameter key. - */ - public boolean containsValue( String key ) - { - return options.get( key ) != null; - } - - /** - * Returns the option value for the given parameter key. - */ - public String get( String key ) - { - return options.get( key ); - } - - /** - * Returns the option value for the given parameter key as in Integer. - */ - public Integer getInt( String key ) - { - return options.containsKey( key ) ? Integer.parseInt( options.get( key ) ) : null; - } - - /** - * Indicates whether the option value for the parameter key is true. - */ - public boolean isTrue( String key ) - { - return options.containsKey( key ) && Boolean.parseBoolean( options.get( key ) ); - } - - //-------------------------------------------------------------------------- - // Getters and Setters - //-------------------------------------------------------------------------- - - public Map getOptions() - { - return options; - } - - public void setOptions( Map options ) - { - this.options = options; - } - - public boolean isAssumeTrue() - { - return assumeTrue; - } - - public void setAssumeTrue( boolean assumeTrue ) - { - this.assumeTrue = assumeTrue; - } - - //-------------------------------------------------------------------------- - // Getters for standard options - //-------------------------------------------------------------------------- - - public Date getLastUpdated() - { - return getDate( "lastUpdated" ); - } - - //-------------------------------------------------------------------------- - // Adding options - //-------------------------------------------------------------------------- - - public void addOption( String option, String value ) - { - options.put( option, value ); - } - - public void addOptions( Map newOptions ) - { - options.putAll( options ); - } -} === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/TranslateOptions.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/TranslateOptions.java 2015-02-16 03:56:25 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/TranslateOptions.java 1970-01-01 00:00:00 +0000 @@ -1,72 +0,0 @@ -package org.hisp.dhis.dxf2.metadata; - -/* - * Copyright (c) 2004-2015, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.springframework.util.StringUtils; - -import java.util.Locale; - -/** - * @author Morten Olav Hansen - */ -public class TranslateOptions -{ - private boolean translate; - - private String locale; - - public TranslateOptions() - { - } - - public boolean isTranslate() - { - return translate || !StringUtils.isEmpty( locale ); - } - - public void setTranslate( boolean translate ) - { - this.translate = translate; - } - - public Locale getLocale() - { - return Locale.forLanguageTag( locale ); - } - - public void setLocale( String locale ) - { - this.locale = locale; - } - - public boolean defaultLocale() - { - return StringUtils.isEmpty( locale ); - } -} === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/OrganisationUnitObjectHandler.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/OrganisationUnitObjectHandler.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/handlers/OrganisationUnitObjectHandler.java 2015-02-17 06:00:52 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.utils.OrganisationUnitUtils; +import org.hisp.dhis.dxf2.common.OrganisationUnitUtils; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.comparator.OrganisationUnitComparator; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-02-13 08:31:40 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/importers/DefaultIdentifiableObjectImporter.java 2015-02-17 06:00:52 +0000 @@ -51,9 +51,9 @@ import org.hisp.dhis.dataentryform.DataEntryForm; import org.hisp.dhis.dataentryform.DataEntryFormService; import org.hisp.dhis.dxf2.importsummary.ImportConflict; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportTypeSummary; -import org.hisp.dhis.dxf2.metadata.ImportUtils; +import org.hisp.dhis.dxf2.common.ImportUtils; import org.hisp.dhis.dxf2.metadata.Importer; import org.hisp.dhis.dxf2.metadata.ObjectBridge; import org.hisp.dhis.dxf2.metadata.handlers.ObjectHandler; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/tasks/ImportMetaDataTask.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/tasks/ImportMetaDataTask.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/tasks/ImportMetaDataTask.java 2015-02-17 06:00:52 +0000 @@ -28,7 +28,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.MetaData; import org.hisp.dhis.scheduling.TaskId; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java 2015-02-16 09:43:40 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java 2015-02-17 06:00:52 +0000 @@ -36,8 +36,8 @@ import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.utils.IdSchemes; -import org.hisp.dhis.dxf2.utils.ImportSummaryResponseExtractor; +import org.hisp.dhis.dxf2.common.IdSchemes; +import org.hisp.dhis.dxf2.common.ImportSummaryResponseExtractor; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.util.CodecUtils; import org.joda.time.DateTime; === removed directory 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils' === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/IdSchemes.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/IdSchemes.java 2015-02-16 09:46:42 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/IdSchemes.java 1970-01-01 00:00:00 +0000 @@ -1,145 +0,0 @@ -package org.hisp.dhis.dxf2.utils; - -/* - * Copyright (c) 2004-2015, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.hisp.dhis.common.IdentifiableObject; -import org.hisp.dhis.common.IdentifiableProperty; - -/** - * @author Morten Olav Hansen - */ -public class IdSchemes -{ - private IdentifiableProperty idScheme; - - private IdentifiableProperty dataElementIdScheme = IdentifiableProperty.UID; - - private IdentifiableProperty categoryOptionComboIdScheme = IdentifiableProperty.UID; - - private IdentifiableProperty orgUnitIdScheme = IdentifiableProperty.UID; - - private IdentifiableProperty programIdScheme = IdentifiableProperty.UID; - - private IdentifiableProperty programStageIdScheme = IdentifiableProperty.UID; - - public IdSchemes() - { - } - - public IdentifiableProperty getIdScheme() - { - return idScheme; - } - - public IdentifiableProperty getIdentifiableProperty( IdentifiableProperty identifiableProperty ) - { - return idScheme != null ? idScheme : identifiableProperty; - } - - public void setIdScheme( IdentifiableProperty idScheme ) - { - this.idScheme = idScheme; - } - - public IdentifiableProperty getDataElementIdScheme() - { - return getIdentifiableProperty( dataElementIdScheme ); - } - - public void setDataElementIdScheme( IdentifiableProperty dataElementIdScheme ) - { - this.dataElementIdScheme = dataElementIdScheme; - } - - public IdentifiableProperty getCategoryOptionComboIdScheme() - { - return getIdentifiableProperty( categoryOptionComboIdScheme ); - } - - public void setCategoryOptionComboIdScheme( IdentifiableProperty categoryOptionComboIdScheme ) - { - this.categoryOptionComboIdScheme = categoryOptionComboIdScheme; - } - - public IdentifiableProperty getOrgUnitIdScheme() - { - return getIdentifiableProperty( orgUnitIdScheme ); - } - - public void setOrgUnitIdScheme( IdentifiableProperty orgUnitIdScheme ) - { - this.orgUnitIdScheme = orgUnitIdScheme; - } - - public IdentifiableProperty getProgramIdScheme() - { - return getIdentifiableProperty( programIdScheme ); - } - - public void setProgramIdScheme( IdentifiableProperty programIdScheme ) - { - this.programIdScheme = programIdScheme; - } - - public IdentifiableProperty getProgramStageIdScheme() - { - return getIdentifiableProperty( programStageIdScheme ); - } - - public void setProgramStageIdScheme( IdentifiableProperty programStageIdScheme ) - { - this.programStageIdScheme = programStageIdScheme; - } - - public static String getValue( String uid, String code, IdentifiableProperty identifiableProperty ) - { - boolean idScheme = IdentifiableProperty.ID.equals( identifiableProperty ) || IdentifiableProperty.UID.equals( identifiableProperty ); - return idScheme ? uid : code; - } - - public static String getValue( IdentifiableObject identifiableObject, IdentifiableProperty identifiableProperty ) - { - boolean idScheme = IdentifiableProperty.ID.equals( identifiableProperty ) || IdentifiableProperty.UID.equals( identifiableProperty ); - - if ( idScheme ) - { - return identifiableObject.getUid(); - } - else if ( IdentifiableProperty.CODE.equals( identifiableProperty ) ) - { - return identifiableObject.getCode(); - } - else if ( IdentifiableProperty.NAME.equals( identifiableProperty ) ) - { - return identifiableObject.getName(); - } - - return null; - } -} === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/ImportSummaryResponseExtractor.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/ImportSummaryResponseExtractor.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/ImportSummaryResponseExtractor.java 1970-01-01 00:00:00 +0000 @@ -1,65 +0,0 @@ -package org.hisp.dhis.dxf2.utils; - -/* - * Copyright (c) 2004-2015, 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.io.IOException; - -import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.springframework.http.HttpStatus; -import org.springframework.http.client.ClientHttpResponse; -import org.springframework.web.client.HttpServerErrorException; -import org.springframework.web.client.ResponseExtractor; - -/** - * Converts a response into an ImportSummary instance. - * - * @throws HttpServerErrorException if the response status code is different - * from 200 OK or 201 Created. - * @throws IOException if converting the response into an ImportSummary failed. - * - * @author Lars Helge Overland - */ -public class ImportSummaryResponseExtractor - implements ResponseExtractor -{ - @Override - public ImportSummary extractData( ClientHttpResponse response ) throws IOException - { - ImportSummary summary = JacksonUtils.fromJson( response.getBody(), ImportSummary.class ); - - HttpStatus status = response.getStatusCode(); - - if ( !( HttpStatus.CREATED.equals( status ) || HttpStatus.OK.equals( status ) ) ) - { - throw new HttpServerErrorException( status, "Data synch failed on remote server" ); - } - - return summary; - } -} === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/JacksonUtils.java 1970-01-01 00:00:00 +0000 @@ -1,228 +0,0 @@ -package org.hisp.dhis.dxf2.utils; - -/* - * Copyright (c) 2004-2015, 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 com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import com.fasterxml.jackson.dataformat.xml.ser.ToXmlGenerator; -import org.hisp.dhis.common.view.BasicView; -import org.hisp.dhis.common.view.DetailedView; -import org.hisp.dhis.common.view.DimensionalView; -import org.hisp.dhis.common.view.ExportView; -import org.hisp.dhis.common.view.SharingBasicView; -import org.hisp.dhis.common.view.SharingDetailedView; -import org.hisp.dhis.common.view.SharingExportView; -import org.hisp.dhis.common.view.ShortNameView; -import org.hisp.dhis.common.view.UuidView; -import org.hisp.dhis.common.view.WithoutOrganisationUnitsView; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.HashMap; -import java.util.Map; - -/** - * @author Morten Olav Hansen - */ -public class JacksonUtils -{ - private final static ObjectMapper jsonMapper = new ObjectMapper(); - - private final static XmlMapper xmlMapper = new XmlMapper(); - - private final static Map> viewClasses = new HashMap<>(); - - static - { - ObjectMapper[] objectMappers = new ObjectMapper[]{ jsonMapper, xmlMapper }; - // DateFormat format = new SimpleDateFormat( "yyyy-MM-dd'T'HH:mm:ssZ" ); - - for ( ObjectMapper objectMapper : objectMappers ) - { - // objectMapper.setDateFormat( format ); - objectMapper.setSerializationInclusion( JsonInclude.Include.NON_NULL ); - objectMapper.configure( SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false ); - objectMapper.configure( SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false ); - objectMapper.configure( SerializationFeature.FAIL_ON_EMPTY_BEANS, false ); - objectMapper.configure( SerializationFeature.WRAP_EXCEPTIONS, true ); - - objectMapper.configure( DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false ); - objectMapper.configure( DeserializationFeature.FAIL_ON_NULL_FOR_PRIMITIVES, true ); - objectMapper.configure( DeserializationFeature.WRAP_EXCEPTIONS, true ); - - objectMapper.disable( MapperFeature.AUTO_DETECT_FIELDS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_CREATORS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_GETTERS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_SETTERS ); - objectMapper.disable( MapperFeature.AUTO_DETECT_IS_GETTERS ); - } - - jsonMapper.getFactory().enable( JsonGenerator.Feature.QUOTE_FIELD_NAMES ); - xmlMapper.configure( ToXmlGenerator.Feature.WRITE_XML_DECLARATION, true ); - - // Register view classes - - viewClasses.put( "default", BasicView.class ); - viewClasses.put( "basic", BasicView.class ); - viewClasses.put( "sharing", SharingBasicView.class ); - viewClasses.put( "sharingBasic", SharingBasicView.class ); - viewClasses.put( "shortName", ShortNameView.class ); - viewClasses.put( "detailed", DetailedView.class ); - viewClasses.put( "sharingDetailed", SharingDetailedView.class ); - viewClasses.put( "uuid", UuidView.class ); - viewClasses.put( "export", ExportView.class ); - viewClasses.put( "sharingExport", SharingExportView.class ); - viewClasses.put( "dimensional", DimensionalView.class ); - viewClasses.put( "withoutOrganisationUnits", WithoutOrganisationUnitsView.class ); - } - - /** - * TODO remove - */ - public static Class getViewClass( Object viewName ) - { - if ( viewName == null || !(viewName instanceof String && ((String) viewName).length() != 0) ) - { - return viewClasses.get( "default" ); - } - - return viewClasses.get( viewName ); - } - - //-------------------------------------------------------------------------- - // Global pre-configured instances of ObjectMapper and XmlMapper - //-------------------------------------------------------------------------- - - public static ObjectMapper getJsonMapper() - { - return jsonMapper; - } - - public static XmlMapper getXmlMapper() - { - return xmlMapper; - } - - //-------------------------------------------------------------------------- - // JSON - //-------------------------------------------------------------------------- - - public static void toJson( OutputStream output, Object value ) throws IOException - { - jsonMapper.writeValue( output, value ); - } - - public static String toJsonAsString( Object value ) throws IOException - { - return jsonMapper.writeValueAsString( value ); - } - - /** - * TODO remove - */ - public static void toJsonWithView( OutputStream output, Object value, Class viewClass ) throws IOException - { - jsonMapper.writerWithView( viewClass ).writeValue( output, value ); - } - - /** - * TODO remove - */ - public static String toJsonWithViewAsString( Object value, Class viewClass ) throws IOException - { - return jsonMapper.writerWithView( viewClass ).writeValueAsString( value ); - } - - @SuppressWarnings( "unchecked" ) - public static T fromJson( InputStream input, Class clazz ) throws IOException - { - return (T) jsonMapper.readValue( input, clazz ); - } - - @SuppressWarnings( "unchecked" ) - public static T fromJson( String input, Class clazz ) throws IOException - { - return (T) jsonMapper.readValue( input, clazz ); - } - - //-------------------------------------------------------------------------- - // XML - //-------------------------------------------------------------------------- - - public static void toXml( OutputStream output, Object value ) throws IOException - { - xmlMapper.writeValue( output, value ); - } - - public static String toXmlAsString( Object value ) throws IOException - { - return xmlMapper.writeValueAsString( value ); - } - - /** - * TODO remove - */ - public static void toXmlWithView( OutputStream output, Object value, Class viewClass ) throws IOException - { - xmlMapper.writerWithView( viewClass ).writeValue( output, value ); - } - - /** - * TODO remove - */ - public static String toXmlWithViewAsString( Object value, Class viewClass ) throws IOException - { - return xmlMapper.writerWithView( viewClass ).writeValueAsString( value ); - } - - @SuppressWarnings( "unchecked" ) - public static T fromXml( InputStream input, Class clazz ) throws IOException - { - return (T) xmlMapper.readValue( input, clazz ); - } - - @SuppressWarnings( "unchecked" ) - public static T fromXml( String input, Class clazz ) throws IOException - { - return (T) xmlMapper.readValue( input, clazz ); - } - - @SuppressWarnings( "unchecked" ) - public static T fromJson( InputStream inputStream, TypeReference typeReference ) throws IOException - { - return (T) jsonMapper.readValue( inputStream, typeReference ); - } -} === removed file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/OrganisationUnitUtils.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/OrganisationUnitUtils.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/OrganisationUnitUtils.java 1970-01-01 00:00:00 +0000 @@ -1,106 +0,0 @@ -package org.hisp.dhis.dxf2.utils; - -/* - * Copyright (c) 2004-2015, University of Oslo - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * Neither the name of the HISP project nor the names of its contributors may - * be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON - * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -import org.hisp.dhis.organisationunit.OrganisationUnit; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - -/** - * @author Morten Olav Hansen - */ -public class OrganisationUnitUtils -{ - private static Map getOrganisationUnitMap( Collection organisationUnits ) - { - Map organisationUnitMap = new HashMap<>(); - - for ( OrganisationUnit organisationUnit : organisationUnits ) - { - if ( organisationUnit.getUid() != null ) - { - organisationUnitMap.put( organisationUnit.getUid(), organisationUnit ); - } - - if ( organisationUnit.getCode() != null ) - { - organisationUnitMap.put( organisationUnit.getCode(), organisationUnit ); - } - - if ( organisationUnit.getName() != null ) - { - organisationUnitMap.put( organisationUnit.getName(), organisationUnit ); - } - - if ( organisationUnit.getShortName() != null ) - { - organisationUnitMap.put( organisationUnit.getShortName(), organisationUnit ); - } - } - - return organisationUnitMap; - } - - public static void updateParents( Collection organisationUnits ) - { - Map organisationUnitMap = getOrganisationUnitMap( organisationUnits ); - - for ( OrganisationUnit organisationUnit : organisationUnits ) - { - OrganisationUnit parent = organisationUnit.getParent(); - - if ( parent != null ) - { - if ( parent.getUid() != null ) - { - parent = organisationUnitMap.get( parent.getUid() ); - } - else if ( parent.getCode() != null ) - { - parent = organisationUnitMap.get( parent.getCode() ); - } - else if ( parent.getName() != null ) - { - parent = organisationUnitMap.get( parent.getName() ); - } - else if ( parent.getShortName() != null ) - { - parent = organisationUnitMap.get( parent.getShortName() ); - } - } - - if ( parent != null ) - { - organisationUnit.setParent( parent ); - } - } - } -} === 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 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/datavalueset/DataValueSetServiceTest.java 2015-02-17 06:00:52 +0000 @@ -54,7 +54,7 @@ import org.hisp.dhis.datavalue.DataValue; import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.jdbc.batchhandler.DataValueBatchHandler; import org.hisp.dhis.mock.batchhandler.MockBatchHandler; import org.hisp.dhis.mock.batchhandler.MockBatchHandlerFactory; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/DefaultExportServiceTest.java 2015-02-17 06:00:52 +0000 @@ -45,7 +45,8 @@ import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.datavalue.DataValueService; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; +import org.hisp.dhis.dxf2.common.Options; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.MonthlyPeriodType; === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/test/java/org/hisp/dhis/dxf2/metadata/JacksonUtilsTest.java 2015-02-17 06:00:52 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.common.view.DetailedView; import org.hisp.dhis.common.view.ExportView; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.junit.Test; /** === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2015-02-16 06:41:14 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AbstractCrudController.java 2015-02-17 06:00:52 +0000 @@ -42,7 +42,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.ImportTypeSummary; -import org.hisp.dhis.dxf2.metadata.TranslateOptions; +import org.hisp.dhis.dxf2.common.TranslateOptions; import org.hisp.dhis.dxf2.objectfilter.ObjectFilterService; import org.hisp.dhis.dxf2.render.RenderService; import org.hisp.dhis.hibernate.exception.CreateAccessDeniedException; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregatedValueController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregatedValueController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregatedValueController.java 2015-02-17 06:00:52 +0000 @@ -32,7 +32,7 @@ import org.hisp.dhis.aggregation.AggregatedDataValueService; import org.hisp.dhis.aggregation.AggregatedIndicatorValue; import org.hisp.dhis.webapi.utils.ContextUtils; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.dataelement.DataElementService; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.indicator.IndicatorService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AppController.java 2015-02-17 06:00:52 +0000 @@ -43,7 +43,7 @@ import org.hisp.dhis.appmanager.App; import org.hisp.dhis.appmanager.AppManager; import org.hisp.dhis.dxf2.render.RenderService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.external.location.LocationManager; import org.hisp.dhis.hibernate.exception.ReadAccessDeniedException; import org.hisp.dhis.system.util.DateUtils; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2015-02-05 06:53:38 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ChartController.java 2015-02-17 06:00:52 +0000 @@ -47,7 +47,7 @@ import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.indicator.Indicator; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CompleteDataSetRegistrationController.java 2015-02-17 06:00:52 +0000 @@ -54,7 +54,7 @@ import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.dxf2.render.RenderService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.organisationunit.OrganisationUnit; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardController.java 2015-02-16 06:41:14 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DashboardController.java 2015-02-17 06:00:52 +0000 @@ -33,8 +33,7 @@ import org.hisp.dhis.dashboard.DashboardItem; import org.hisp.dhis.dashboard.DashboardSearchResult; import org.hisp.dhis.dashboard.DashboardService; -import org.hisp.dhis.dxf2.metadata.TranslateOptions; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.hibernate.exception.DeleteAccessDeniedException; import org.hisp.dhis.schema.descriptors.DashboardItemSchemaDescriptor; import org.hisp.dhis.schema.descriptors.DashboardSchemaDescriptor; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataApprovalController.java 2015-02-17 06:00:52 +0000 @@ -60,7 +60,7 @@ import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.dataset.DataSet; import org.hisp.dhis.dataset.DataSetService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.Period; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java 2015-02-17 06:00:52 +0000 @@ -53,7 +53,7 @@ import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.metadata.ExportService; import org.hisp.dhis.dxf2.metadata.MetaData; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18nService; import org.hisp.dhis.node.types.RootNode; import org.hisp.dhis.organisationunit.OrganisationUnit; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java 2015-02-16 09:43:40 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataValueSetController.java 2015-02-17 06:00:52 +0000 @@ -32,9 +32,9 @@ import org.apache.commons.logging.LogFactory; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.metadata.ImportOptions; -import org.hisp.dhis.dxf2.utils.IdSchemes; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.ImportOptions; +import org.hisp.dhis.dxf2.common.IdSchemes; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.webapi.utils.ContextUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java 2015-02-16 06:41:14 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DimensionController.java 2015-02-17 06:00:52 +0000 @@ -42,7 +42,7 @@ import org.hisp.dhis.common.NameableObject; import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; import org.hisp.dhis.dataset.DataSet; -import org.hisp.dhis.dxf2.metadata.TranslateOptions; +import org.hisp.dhis.dxf2.common.TranslateOptions; import org.hisp.dhis.node.AbstractNode; import org.hisp.dhis.node.Node; import org.hisp.dhis.node.NodeUtils; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FilteredMetaDataController.java 2015-02-17 06:00:52 +0000 @@ -43,12 +43,12 @@ import org.hisp.dhis.webapi.utils.ContextUtils; import org.hisp.dhis.common.view.ExportView; import org.hisp.dhis.dxf2.metadata.ExportService; -import org.hisp.dhis.dxf2.metadata.FilterOptions; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.FilterOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.MetaData; import org.hisp.dhis.dxf2.metadata.tasks.ImportMetaDataTask; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.filter.MetaDataFilter; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.scheduling.TaskCategory; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/I18nController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/I18nController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/I18nController.java 2015-02-17 06:00:52 +0000 @@ -30,7 +30,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import org.hisp.dhis.dxf2.render.RenderService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18n; import org.hisp.dhis.i18n.I18nManager; import org.springframework.beans.factory.annotation.Autowired; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java 2015-02-13 15:23:56 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MaintenanceController.java 2015-02-17 06:00:52 +0000 @@ -34,7 +34,7 @@ import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.dxf2.metadata.ExportService; import org.hisp.dhis.dxf2.metadata.MetaData; -import org.hisp.dhis.dxf2.metadata.Options; +import org.hisp.dhis.dxf2.common.Options; import org.hisp.dhis.dxf2.render.RenderService; import org.hisp.dhis.dxf2.schema.SchemaValidator; import org.hisp.dhis.dxf2.schema.ValidationViolation; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2015-02-16 03:56:25 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MessageConversationController.java 2015-02-17 06:00:52 +0000 @@ -31,8 +31,8 @@ import com.google.common.collect.Lists; import org.hisp.dhis.acl.AclService; import org.hisp.dhis.common.Pager; -import org.hisp.dhis.dxf2.metadata.TranslateOptions; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.TranslateOptions; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.hibernate.exception.DeleteAccessDeniedException; import org.hisp.dhis.hibernate.exception.UpdateAccessDeniedException; import org.hisp.dhis.message.MessageService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/MetaDataController.java 2015-02-17 06:00:52 +0000 @@ -29,12 +29,12 @@ */ import org.hisp.dhis.dxf2.metadata.ExportService; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.ImportSummary; import org.hisp.dhis.dxf2.metadata.MetaData; import org.hisp.dhis.dxf2.metadata.tasks.ImportMetaDataTask; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.scheduling.TaskCategory; import org.hisp.dhis.scheduling.TaskId; === 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 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/PdfFormController.java 2015-02-17 06:00:52 +0000 @@ -35,7 +35,7 @@ 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; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.pdfform.PdfDataEntryFormService; import org.hisp.dhis.dxf2.pdfform.PdfDataEntryFormUtil; import org.hisp.dhis.dxf2.pdfform.PdfFormFontSettings; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java 2015-02-05 06:53:38 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ReportTableController.java 2015-02-17 06:00:52 +0000 @@ -41,7 +41,7 @@ import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.common.Grid; import org.hisp.dhis.common.MergeStrategy; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.mapping.MappingService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java 2015-01-27 12:46:32 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SharingController.java 2015-02-17 06:00:52 +0000 @@ -43,7 +43,7 @@ import org.hisp.dhis.common.BaseIdentifiableObject; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectManager; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.user.UserGroup; import org.hisp.dhis.user.UserGroupAccess; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java 2015-02-17 06:00:52 +0000 @@ -31,7 +31,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportSummary; import org.hisp.dhis.dxf2.synch.AvailabilityStatus; import org.hisp.dhis.dxf2.synch.SynchronizationManager; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java 2015-02-16 07:04:07 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemController.java 2015-02-17 06:00:52 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.common.CodeGenerator; import org.hisp.dhis.dxf2.metadata.ImportSummary; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.node.exception.InvalidTypeException; import org.hisp.dhis.node.types.CollectionNode; import org.hisp.dhis.node.types.RootNode; @@ -41,7 +41,6 @@ import org.hisp.dhis.system.SystemService; import org.hisp.dhis.system.notification.Notification; import org.hisp.dhis.system.notification.Notifier; -import org.hisp.dhis.system.scheduling.Scheduler; import org.hisp.dhis.user.CurrentUserService; import org.hisp.dhis.webapi.utils.ContextUtils; import org.springframework.beans.factory.annotation.Autowired; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementGroupController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementGroupController.java 2015-02-16 05:30:23 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/dataelement/DataElementGroupController.java 2015-02-17 06:00:52 +0000 @@ -35,7 +35,7 @@ import org.hisp.dhis.dataelement.DataElementCategoryService; import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dataelement.DataElementOperand; -import org.hisp.dhis.dxf2.metadata.TranslateOptions; +import org.hisp.dhis.dxf2.common.TranslateOptions; import org.hisp.dhis.schema.descriptors.DataElementGroupSchemaDescriptor; import org.hisp.dhis.webapi.controller.AbstractCrudController; import org.hisp.dhis.webapi.utils.ContextUtils; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EnrollmentController.java 2015-02-17 06:00:52 +0000 @@ -39,7 +39,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2015-02-05 06:53:38 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventChartController.java 2015-02-17 06:00:52 +0000 @@ -41,7 +41,7 @@ import org.hisp.dhis.chart.ChartService; import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.common.MergeStrategy; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.eventchart.EventChart; import org.hisp.dhis.eventchart.EventChartService; import org.hisp.dhis.i18n.I18nFormat; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2015-02-16 08:37:44 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventController.java 2015-02-17 06:00:52 +0000 @@ -47,9 +47,9 @@ import org.hisp.dhis.dxf2.importsummary.ImportStatus; import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; -import org.hisp.dhis.dxf2.metadata.ImportOptions; -import org.hisp.dhis.dxf2.utils.IdSchemes; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.ImportOptions; +import org.hisp.dhis.dxf2.common.IdSchemes; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.organisationunit.OrganisationUnit; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2015-02-05 06:53:38 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/EventReportController.java 2015-02-17 06:00:52 +0000 @@ -37,7 +37,7 @@ import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.common.MergeStrategy; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.eventreport.EventReport; import org.hisp.dhis.eventreport.EventReportService; import org.hisp.dhis.i18n.I18nFormat; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2015-02-06 04:16:45 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/event/TrackedEntityInstanceController.java 2015-02-17 06:00:52 +0000 @@ -40,7 +40,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportSummaries; import org.hisp.dhis.dxf2.importsummary.ImportSummary; import org.hisp.dhis.dxf2.objectfilter.ObjectFilterService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.node.types.CollectionNode; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java 2015-02-05 06:53:38 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapController.java 2015-02-17 06:00:52 +0000 @@ -41,7 +41,7 @@ import org.hisp.dhis.common.DimensionService; import org.hisp.dhis.common.MergeStrategy; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.i18n.I18nManager; import org.hisp.dhis.mapgeneration.MapGenerationService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapLegendSetController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapLegendSetController.java 2015-02-05 06:53:38 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/MapLegendSetController.java 2015-02-17 06:00:52 +0000 @@ -29,7 +29,7 @@ */ import org.hisp.dhis.common.MergeStrategy; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.mapping.MapLegend; import org.hisp.dhis.mapping.MapLegendSet; import org.hisp.dhis.mapping.MappingService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2015-02-16 05:30:23 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitController.java 2015-02-17 06:00:52 +0000 @@ -33,7 +33,7 @@ import com.google.common.collect.Lists; import org.hisp.dhis.common.Pager; -import org.hisp.dhis.dxf2.metadata.TranslateOptions; +import org.hisp.dhis.dxf2.common.TranslateOptions; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.organisationunit.comparator.OrganisationUnitByLevelComparator; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java 2015-02-17 06:00:52 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.attribute.Attribute; import org.hisp.dhis.attribute.AttributeValue; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.organisationunit.OrganisationUnit; import org.hisp.dhis.organisationunit.OrganisationUnitGroup; import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java 2015-01-23 14:24:30 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/user/CurrentUserController.java 2015-02-17 06:00:52 +0000 @@ -42,7 +42,7 @@ import org.hisp.dhis.dataset.DataSetService; import org.hisp.dhis.dxf2.fieldfilter.FieldFilterService; import org.hisp.dhis.dxf2.render.RenderService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.i18n.I18nService; import org.hisp.dhis.interpretation.Interpretation; import org.hisp.dhis.interpretation.InterpretationService; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonJsonView.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonJsonView.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonJsonView.java 2015-02-17 06:00:52 +0000 @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.util.JSONPObject; import org.hisp.dhis.webapi.utils.ContextUtils; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.servlet.view.AbstractView; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonXmlView.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonXmlView.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/view/JacksonXmlView.java 2015-02-17 06:00:52 +0000 @@ -30,7 +30,7 @@ import org.hisp.dhis.webapi.utils.ContextUtils; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.servlet.view.AbstractView; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebOptions.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebOptions.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/webdomain/WebOptions.java 2015-02-17 06:00:52 +0000 @@ -29,7 +29,7 @@ */ import org.hisp.dhis.common.Pager; -import org.hisp.dhis.dxf2.metadata.Options; +import org.hisp.dhis.dxf2.common.Options; import java.util.Map; === modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/UploadAnonymousEventAction.java' --- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/UploadAnonymousEventAction.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/UploadAnonymousEventAction.java 2015-02-17 06:00:52 +0000 @@ -34,7 +34,7 @@ import org.apache.struts2.ServletActionContext; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementService; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.event.EventStatus; import org.hisp.dhis.i18n.I18nFormat; import org.hisp.dhis.organisationunit.OrganisationUnit; === 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 2015-02-16 09:43:40 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ExportDataValueAction.java 2015-02-17 06:00:52 +0000 @@ -33,7 +33,7 @@ import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; -import org.hisp.dhis.dxf2.utils.IdSchemes; +import org.hisp.dhis.dxf2.common.IdSchemes; import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.oust.manager.SelectionTreeManager; import org.hisp.dhis.util.ContextUtils; === 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 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java 2015-02-17 06:00:52 +0000 @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory; import org.hisp.dhis.common.IdentifiableProperty; import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.importexport.action.util.ImportDataValueTask; import org.hisp.dhis.scheduling.TaskCategory; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java 2015-02-17 06:00:52 +0000 @@ -40,7 +40,7 @@ import org.hisp.dhis.dataelement.DataElementGroup; import org.hisp.dhis.dxf2.csv.CsvImportService; import org.hisp.dhis.dxf2.gml.GmlImportService; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.importexport.ImportStrategy; import org.hisp.dhis.importexport.action.util.ImportMetaDataCsvTask; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java 2015-02-17 06:00:52 +0000 @@ -34,7 +34,7 @@ import org.hisp.dhis.dxf2.events.event.ImportEventTask; import org.hisp.dhis.dxf2.events.event.ImportEventsTask; import org.hisp.dhis.dxf2.events.event.csv.CsvEventService; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.scheduling.TaskCategory; import org.hisp.dhis.scheduling.TaskId; import org.hisp.dhis.system.notification.Notifier; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportDataValueTask.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportDataValueTask.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportDataValueTask.java 2015-02-17 06:00:52 +0000 @@ -29,7 +29,7 @@ */ import org.hisp.dhis.dxf2.datavalueset.DataValueSetService; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.scheduling.TaskId; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataCsvTask.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataCsvTask.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataCsvTask.java 2015-02-17 06:00:52 +0000 @@ -34,7 +34,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.dxf2.csv.CsvImportService; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.MetaData; import org.hisp.dhis.scheduling.TaskId; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.java 2015-02-12 13:52:14 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataGmlTask.java 2015-02-17 06:00:52 +0000 @@ -31,7 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hisp.dhis.dxf2.gml.GmlImportService; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.scheduling.TaskId; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataTask.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataTask.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/util/ImportMetaDataTask.java 2015-02-17 06:00:52 +0000 @@ -30,10 +30,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hisp.dhis.dxf2.metadata.ImportOptions; +import org.hisp.dhis.dxf2.common.ImportOptions; import org.hisp.dhis.dxf2.metadata.ImportService; import org.hisp.dhis.dxf2.metadata.MetaData; -import org.hisp.dhis.dxf2.utils.JacksonUtils; +import org.hisp.dhis.dxf2.common.JacksonUtils; import org.hisp.dhis.scheduling.TaskId; import org.hisp.dhis.system.util.DebugUtils;