dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40453
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20510: Removed import-export classes
------------------------------------------------------------
revno: 20510
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-10-05 19:23:54 +0200
message:
Removed import-export classes
removed:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ImportableObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/AssociationType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberAssociation.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObjectStatus.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/comparator/
dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/comparator/ImportObjectComparator.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java
dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java
dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java 2015-07-14 07:21:33 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObject.java 2015-10-05 17:23:54 +0000
@@ -39,7 +39,7 @@
* @author Lars Helge Overland
*/
public interface IdentifiableObject
- extends ImportableObject, LinkableObject, Comparable<IdentifiableObject>, Mergeable<IdentifiableObject>
+ extends LinkableObject, Comparable<IdentifiableObject>, Mergeable<IdentifiableObject>
{
String[] I18N_PROPERTIES = { "name" };
@@ -47,7 +47,6 @@
String getUid();
- @Override
String getName();
String getDisplayName();
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ImportableObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ImportableObject.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/ImportableObject.java 1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-package org.hisp.dhis.common;
-
-import java.io.Serializable;
-
-/*
- * 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.
- */
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public interface ImportableObject
- extends Serializable
-{
- String getName();
-}
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2015-08-31 07:23:07 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/datavalue/DataValue.java 2015-10-05 17:23:54 +0000
@@ -28,23 +28,22 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.io.Serializable;
+import java.util.Date;
+import java.util.regex.Pattern;
+
import org.apache.commons.lang3.StringUtils;
-import org.hisp.dhis.common.ImportableObject;
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.regex.Pattern;
-
/**
* @author Kristian Nordal
* @version $Id: DataValue.java 4638 2008-02-25 10:06:47Z larshelg $
*/
public class DataValue
- implements Serializable, ImportableObject
+ implements Serializable
{
/**
* Determines if a de-serialized file is compatible with this class.
@@ -145,16 +144,6 @@
}
// -------------------------------------------------------------------------
- // Dimension
- // -------------------------------------------------------------------------
-
- @Override
- public String getName()
- {
- throw new UnsupportedOperationException();
- }
-
- // -------------------------------------------------------------------------
// Logic
// -------------------------------------------------------------------------
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/AssociationType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/AssociationType.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/AssociationType.java 1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-package org.hisp.dhis.importexport;
-
-/*
- * 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.
- */
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public enum AssociationType
-{
- SET,
- LIST
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberAssociation.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberAssociation.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberAssociation.java 1970-01-01 00:00:00 +0000
@@ -1,164 +0,0 @@
-package org.hisp.dhis.importexport;
-
-/*
- * 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.ImportableObject;
-
-/**
- * @author Lars Helge Overland
- */
-public class GroupMemberAssociation
- implements ImportableObject
-{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = -8480207952613722482L;
-
- private int groupId;
-
- private int memberId;
-
- private int sortOrder;
-
- private AssociationType associationType;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- @SuppressWarnings( "unused" )
- private GroupMemberAssociation()
- {
- }
-
- public GroupMemberAssociation( AssociationType associationType )
- {
- this.associationType = associationType;
- }
-
- public GroupMemberAssociation( int groupId, int memberId )
- {
- this.groupId = groupId;
- this.memberId = memberId;
- this.associationType = AssociationType.SET;
- }
-
- public GroupMemberAssociation( int groupId, int memberId, int sortOrder )
- {
- this.groupId = groupId;
- this.memberId = memberId;
- this.sortOrder = sortOrder;
- this.associationType = AssociationType.LIST;
- }
-
- // -------------------------------------------------------------------------
- // hashCode and equals
- // -------------------------------------------------------------------------
-
- @Override
- public int hashCode()
- {
- return 31 * groupId * memberId;
- }
-
- @Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
- return true;
- }
-
- if ( o == null )
- {
- return false;
- }
-
- if ( !(o instanceof GroupMemberAssociation) )
- {
- return false;
- }
-
- final GroupMemberAssociation other = (GroupMemberAssociation) o;
-
- return groupId == other.getGroupId() &&
- memberId == other.getMemberId() && sortOrder == other.getSortOrder();
- }
-
- @Override
- public String getName()
- {
- throw new UnsupportedOperationException();
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- public int getGroupId()
- {
- return groupId;
- }
-
- public void setGroupId( int groupId )
- {
- this.groupId = groupId;
- }
-
- public int getMemberId()
- {
- return memberId;
- }
-
- public void setMemberId( int memberId )
- {
- this.memberId = memberId;
- }
-
- public int getSortOrder()
- {
- return sortOrder;
- }
-
- public void setSortOrder( int sortOrder )
- {
- this.sortOrder = sortOrder;
- }
-
- public AssociationType getAssociationType()
- {
- return associationType;
- }
-
- public void setAssociationType( AssociationType associationType )
- {
- this.associationType = associationType;
- }
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/GroupMemberType.java 1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-package org.hisp.dhis.importexport;
-
-/*
- * 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.
- */
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public enum GroupMemberType
-{
- NONE,
- CATEGORY_CATEGORYOPTION,
- CATEGORYCOMBO_CATEGORY,
- DATAELEMENTGROUP,
- DATAELEMENTGROUPSET,
- INDICATORGROUP,
- INDICATORGROUPSET,
- DATASET,
- DATASET_SOURCE,
- ORGANISATIONUNITGROUP,
- ORGANISATIONUNITGROUPSET,
- ORGANISATIONUNITRELATIONSHIP,
- DATAENTRYFORM
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java 2015-09-16 14:49:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataDailyPeriod.java 1970-01-01 00:00:00 +0000
@@ -1,148 +0,0 @@
-package org.hisp.dhis.importexport;
-
-/*
- * 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.Serializable;
-import java.util.Date;
-
-public class ImportDataDailyPeriod
- implements Serializable
-{
- private int periodId;
-
- private int periodTypeId;
-
- private Date startDate;
-
- private Date endDate;
-
- public ImportDataDailyPeriod()
- {
- }
-
- public ImportDataDailyPeriod( int periodId, int periodTypeId, Date startDate, Date endDate )
- {
- super();
- this.periodId = periodId;
- this.periodTypeId = periodTypeId;
- this.startDate = startDate;
- this.endDate = endDate;
- }
-
- public int getPeriodId()
- {
- return periodId;
- }
-
- public void setPeriodId( int periodId )
- {
- this.periodId = periodId;
- }
-
- public int getPeriodTypeId()
- {
- return periodTypeId;
- }
-
- public void setPeriodTypeId( int periodTypeId )
- {
- this.periodTypeId = periodTypeId;
- }
-
- public Date getStartDate()
- {
- return startDate;
- }
-
- public void setStartDate( Date startDate )
- {
- this.startDate = startDate;
- }
-
- public Date getEndDate()
- {
- return endDate;
- }
-
- public void setEndDate( Date endDate )
- {
- this.endDate = endDate;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((endDate == null) ? 0 : endDate.hashCode());
- result = prime * result + periodId;
- result = prime * result + periodTypeId;
- result = prime * result + ((startDate == null) ? 0 : startDate.hashCode());
- return result;
- }
-
- @Override
- public boolean equals( Object obj )
- {
- if ( this == obj )
- return true;
- if ( obj == null )
- return false;
- if ( getClass() != obj.getClass() )
- return false;
- ImportDataDailyPeriod other = (ImportDataDailyPeriod) obj;
- if ( endDate == null )
- {
- if ( other.endDate != null )
- return false;
- }
- else if ( !endDate.equals( other.endDate ) )
- return false;
- if ( periodId != other.periodId )
- return false;
- if ( periodTypeId != other.periodTypeId )
- return false;
- if ( startDate == null )
- {
- if ( other.startDate != null )
- return false;
- }
- else if ( !startDate.equals( other.startDate ) )
- return false;
- return true;
- }
-
- @Override
- public String toString()
- {
- return "ImportDataDailyPeriod [periodId=" + periodId + ", periodTypeId=" + periodTypeId + ", startDate="
- + startDate + ", endDate=" + endDate + "]";
- }
-
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java 2015-09-16 14:49:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportDataValue.java 1970-01-01 00:00:00 +0000
@@ -1,259 +0,0 @@
-package org.hisp.dhis.importexport;
-
-/*
- * 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.Serializable;
-import java.util.Date;
-
-import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.datavalue.DataValue;
-import org.hisp.dhis.organisationunit.OrganisationUnit;
-import org.hisp.dhis.period.Period;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ImportDataValue
- implements Serializable
-{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = 8854484524956458617L;
-
- private int dataElementId;
-
- private int categoryOptionComboId;
-
- private int periodId;
-
- private int sourceId;
-
- private String value;
-
- private String storedBy;
-
- private Date timestamp;
-
- private String comment;
-
- private String status;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public ImportDataValue()
- {
- }
-
- public ImportDataValue( DataValue dataValue, ImportObjectStatus status )
- {
- setDataValue( dataValue, status );
- }
-
- // -------------------------------------------------------------------------
- // Logic
- // -------------------------------------------------------------------------
-
- public void setDataValue( DataValue dataValue, ImportObjectStatus status )
- {
- this.dataElementId = dataValue.getDataElement().getId();
- this.categoryOptionComboId = dataValue.getCategoryOptionCombo().getId();
- this.periodId = dataValue.getPeriod().getId();
- this.sourceId = dataValue.getSource().getId();
- this.value = dataValue.getValue();
- this.storedBy = dataValue.getStoredBy();
- this.timestamp = dataValue.getLastUpdated();
- this.comment = dataValue.getComment();
- this.status = status.name();
- }
-
- public DataValue getDataValue()
- {
- DataValue value = new DataValue();
-
- DataElement element = new DataElement();
- value.setDataElement( element );
-
- DataElementCategoryOptionCombo optionCombo = new DataElementCategoryOptionCombo();
- value.setCategoryOptionCombo( optionCombo );
-
- Period period = new Period();
- value.setPeriod( period );
-
- OrganisationUnit source = new OrganisationUnit();
- value.setSource( source );
-
- value.getDataElement().setId( this.dataElementId );
- value.getCategoryOptionCombo().setId( this.categoryOptionComboId );
- value.getPeriod().setId( this.periodId );
- value.getSource().setId( this.sourceId );
- value.setValue( this.value );
- value.setStoredBy( this.storedBy );
- value.setLastUpdated( this.timestamp );
- value.setComment( this.comment );
-
- return value;
- }
-
- // -------------------------------------------------------------------------
- // Equals & hashCode
- // -------------------------------------------------------------------------
-
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + dataElementId;
- result = prime * result + periodId;
- result = prime * result + sourceId;
-
- return result;
- }
-
- public boolean equals( Object object )
- {
- if ( this == object )
- {
- return true;
- }
-
- if ( object == null )
- {
- return false;
- }
-
- if ( !( object instanceof ImportDataValue ) )
- {
- return false;
- }
-
- final ImportDataValue other = (ImportDataValue) object;
-
- return dataElementId == other.getDataElementId() &&
- periodId == other.getPeriodId() && sourceId == other.getSourceId();
- }
-
- // -------------------------------------------------------------------------
- // Getters & setters
- // -------------------------------------------------------------------------
-
- public int getDataElementId()
- {
- return dataElementId;
- }
-
- public void setDataElementId( int dataElementId )
- {
- this.dataElementId = dataElementId;
- }
-
- public int getCategoryOptionComboId()
- {
- return categoryOptionComboId;
- }
-
- public void setCategoryOptionComboId( int categoryOptionComboId )
- {
- this.categoryOptionComboId = categoryOptionComboId;
- }
-
- public int getPeriodId()
- {
- return periodId;
- }
-
- public void setPeriodId( int periodId )
- {
- this.periodId = periodId;
- }
-
- public int getSourceId()
- {
- return sourceId;
- }
-
- public void setSourceId( int sourceId )
- {
- this.sourceId = sourceId;
- }
-
- public String getValue()
- {
- return value;
- }
-
- public void setValue( String value )
- {
- this.value = value;
- }
-
- public String getStoredBy()
- {
- return storedBy;
- }
-
- public void setStoredBy( String storedBy )
- {
- this.storedBy = storedBy;
- }
-
- public Date getTimestamp()
- {
- return timestamp;
- }
-
- public void setTimestamp( Date timeStamp )
- {
- this.timestamp = timeStamp;
- }
-
- public String getComment()
- {
- return comment;
- }
-
- public void setComment( String comment )
- {
- this.comment = comment;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- public void setStatus( String status )
- {
- this.status = status;
- }
-}
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java 2015-09-16 14:49:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObject.java 1970-01-01 00:00:00 +0000
@@ -1,215 +0,0 @@
-package org.hisp.dhis.importexport;
-
-import java.io.Serializable;
-
-import org.hisp.dhis.common.ImportableObject;
-
-/*
- * 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.
- */
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class ImportObject
- implements Serializable
-{
- /**
- * Determines if a de-serialized file is compatible with this class.
- */
- private static final long serialVersionUID = 1078032918149125675L;
-
- private int id;
-
- private ImportObjectStatus status;
-
- private String className;
-
- private GroupMemberType groupMemberType;
-
- private ImportableObject object;
-
- private ImportableObject compareObject;
-
- // -------------------------------------------------------------------------
- // Constructors
- // -------------------------------------------------------------------------
-
- public ImportObject()
- {
- }
-
- public ImportObject( ImportObjectStatus status, String className, ImportableObject object )
- {
- this.status = status;
- this.className = className;
- this.groupMemberType = GroupMemberType.NONE;
- this.object = object;
- this.compareObject = null;
- }
-
- public ImportObject( ImportObjectStatus status, String className, GroupMemberType groupMemberType, ImportableObject object )
- {
- this.status = status;
- this.className = className;
- this.groupMemberType = groupMemberType;
- this.object = object;
- this.compareObject = null;
- }
-
- public ImportObject( ImportObjectStatus status, String className, ImportableObject object, ImportableObject compareObject )
- {
- this.status = status;
- this.className = className;
- this.groupMemberType = GroupMemberType.NONE;
- this.object = object;
- this.compareObject = compareObject;
- }
-
- public ImportObject( ImportObjectStatus status, String className, GroupMemberType groupMemberType, ImportableObject object, ImportableObject compareObject )
- {
- this.status = status;
- this.className = className;
- this.groupMemberType = groupMemberType;
- this.object = object;
- this.compareObject = compareObject;
- }
-
- // -------------------------------------------------------------------------
- // hashCode and equals
- // -------------------------------------------------------------------------
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + className.hashCode();
- result = prime * result + object.hashCode();
-
- return result;
- }
-
- @Override
- public boolean equals( Object o )
- {
- if ( this == o )
- {
- return true;
- }
-
- if ( o == null )
- {
- return false;
- }
-
- if ( !( o instanceof ImportObject ) )
- {
- return false;
- }
-
- final ImportObject other = (ImportObject) o;
-
- return status.equals( other.getStatus() ) && className.equals( other.getClassName() ) &&
- groupMemberType.equals( other.getGroupMemberType() ) && object.equals( other.getObject() );
- }
-
- @Override
- public String toString()
- {
- String string = "[Internal id: " + id + ", status: " + status.name() +
- ", class name: " + className + ", group member type: " + groupMemberType.name() + "]";
-
- return string;
- }
-
- // -------------------------------------------------------------------------
- // Getters and setters
- // -------------------------------------------------------------------------
-
- public int getId()
- {
- return id;
- }
-
- public void setId( int id )
- {
- this.id = id;
- }
-
- public ImportObjectStatus getStatus()
- {
- return status;
- }
-
- public void setStatus( ImportObjectStatus status )
- {
- this.status = status;
- }
-
- public String getClassName()
- {
- return className;
- }
-
- public void setClassName( String className )
- {
- this.className = className;
- }
-
- public GroupMemberType getGroupMemberType()
- {
- return groupMemberType;
- }
-
- public void setGroupMemberType( GroupMemberType groupMemberType )
- {
- this.groupMemberType = groupMemberType;
- }
-
- public ImportableObject getObject()
- {
- return object;
- }
-
- public void setObject( ImportableObject object )
- {
- this.object = object;
- }
-
- public ImportableObject getCompareObject()
- {
- return compareObject;
- }
-
- public void setCompareObject( ImportableObject compareObject )
- {
- this.compareObject = compareObject;
- }
-}
-
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObjectStatus.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObjectStatus.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/ImportObjectStatus.java 1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-package org.hisp.dhis.importexport;
-
-/*
- * 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.
- */
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public enum ImportObjectStatus
-{
- NEW,
- UPDATE,
- MATCH
-}
=== removed directory 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/comparator'
=== removed file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/comparator/ImportObjectComparator.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/comparator/ImportObjectComparator.java 2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/importexport/comparator/ImportObjectComparator.java 1970-01-01 00:00:00 +0000
@@ -1,71 +0,0 @@
-package org.hisp.dhis.importexport.comparator;
-
-/*
- * 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.util.Comparator;
-
-import org.hisp.dhis.importexport.ImportObject;
-
-/**
- * @author Lars Helge Overland
- */
-public class ImportObjectComparator
- implements Comparator<ImportObject>
-{
- @Override
- public int compare( ImportObject o0, ImportObject o1 )
- {
- if ( o0 == null || o0.getClassName() == null )
- {
- return 1;
- }
-
- if ( o1 == null || o1.getClassName() == null )
- {
- return -1;
- }
-
- if ( !o0.getClassName().equalsIgnoreCase( o1.getClassName() ) )
- {
- return o0.getClassName().compareToIgnoreCase( o1.getClassName() );
- }
-
- if ( o0.getObject() == null )
- {
- return 1;
- }
-
- if ( o1.getObject() == null )
- {
- return -1;
- }
-
- return o0.getObject().getName().compareToIgnoreCase( o1.getObject().getName() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryCategoryOptionAssociationBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class CategoryCategoryOptionAssociationBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public CategoryCategoryOptionAssociationBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "categories_categoryoptions" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "categoryid" );
- statementBuilder.setUniqueColumn( "sort_order" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getSortOrder() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "categoryid" );
- statementBuilder.setColumn( "categoryoptionid" );
- statementBuilder.setColumn( "sort_order" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- statementBuilder.setValue( association.getSortOrder() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/CategoryComboCategoryAssociationBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class CategoryComboCategoryAssociationBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public CategoryComboCategoryAssociationBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "categorycombos_categories" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "categorycomboid" );
- statementBuilder.setUniqueColumn( "sort_order" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getSortOrder() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "categorycomboid" );
- statementBuilder.setColumn( "categoryid" );
- statementBuilder.setColumn( "sort_order" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- statementBuilder.setValue( association.getSortOrder() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupMemberBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: DataElementGroupMemberBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class DataElementGroupMemberBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataElementGroupMemberBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "dataelementgroupmembers" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "dataelementgroupid" );
- statementBuilder.setUniqueColumn( "dataelementid" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "dataelementgroupid" );
- statementBuilder.setColumn( "dataelementid" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataElementGroupSetMemberBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataElementGroupSetMemberBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataElementGroupSetMemberBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "dataelementgroupsetmembers" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "dataelementgroupsetid" );
- statementBuilder.setUniqueColumn( "sort_order" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getSortOrder() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "dataelementgroupsetid" );
- statementBuilder.setColumn( "dataelementgroupid" );
- statementBuilder.setColumn( "sort_order" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- statementBuilder.setValue( association.getSortOrder() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.dataset.DataSet;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: DataSetBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class DataSetBatchHandler
- extends AbstractBatchHandler<DataSet>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataSetBatchHandler( JdbcConfiguration config )
- {
- super( config, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "dataset" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "datasetid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "datasetid" );
- }
-
- @Override
- protected void setIdentifierValues( DataSet dataSet )
- {
- statementBuilder.setIdentifierValue( dataSet.getId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- statementBuilder.setUniqueColumn( "shortName" );
- statementBuilder.setUniqueColumn( "code" );
- }
-
- @Override
- protected void setUniqueValues( DataSet dataSet )
- {
- statementBuilder.setUniqueValue( dataSet.getName() );
- statementBuilder.setUniqueValue( dataSet.getShortName() );
- statementBuilder.setUniqueValue( dataSet.getCode() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "name" );
- statementBuilder.setColumn( "shortname" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "periodtypeid" );
- statementBuilder.setColumn( "mobile" );
- statementBuilder.setColumn( "openfutureperiods" );
- statementBuilder.setColumn( "dataentryform" );
- statementBuilder.setColumn( "expirydays" );
- statementBuilder.setColumn( "timelydays" );
- statementBuilder.setColumn( "notifycompletinguser" );
- statementBuilder.setColumn( "approvedata" );
- statementBuilder.setColumn( "fieldcombinationrequired" );
- statementBuilder.setColumn( "validcompleteonly" );
- statementBuilder.setColumn( "novaluerequirescomment" );
- statementBuilder.setColumn( "skipoffline" );
- statementBuilder.setColumn( "dataelementdecoration" );
- statementBuilder.setColumn( "renderastabs" );
- statementBuilder.setColumn( "renderhorizontally" );
- }
-
- @Override
- protected void setValues( DataSet dataSet )
- {
- statementBuilder.setValue( dataSet.getUid() );
- statementBuilder.setValue( dataSet.getName() );
- statementBuilder.setValue( dataSet.getShortName() );
- statementBuilder.setValue( dataSet.getCode() );
- statementBuilder.setValue( dataSet.getPeriodType().getId() );
- statementBuilder.setValue( dataSet.isMobile() );
- statementBuilder.setValue( dataSet.getOpenFuturePeriods() );
- statementBuilder.setValue( dataSet.getDataEntryForm() != null ? dataSet.getDataEntryForm().getId() : null );
- statementBuilder.setValue( dataSet.getExpiryDays() );
- statementBuilder.setValue( dataSet.getTimelyDays() );
- statementBuilder.setValue( dataSet.isNotifyCompletingUser() );
- statementBuilder.setValue( dataSet.isApproveData() );
- statementBuilder.setValue( dataSet.isFieldCombinationRequired() );
- statementBuilder.setValue( dataSet.isValidCompleteOnly() );
- statementBuilder.setValue( dataSet.isNoValueRequiresComment() );
- statementBuilder.setValue( dataSet.isSkipOffline() );
- statementBuilder.setValue( dataSet.isDataElementDecoration() );
- statementBuilder.setValue( dataSet.isRenderAsTabs() );
- statementBuilder.setValue( dataSet.isRenderHorizontally() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetCompletenessResultBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.completeness.DataSetCompletenessResult;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataSetCompletenessResultBatchHandler
- extends AbstractBatchHandler<DataSetCompletenessResult>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataSetCompletenessResultBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "aggregateddatasetcompleteness" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "datasetid" );
- statementBuilder.setIdentifierColumn( "periodid" );
- statementBuilder.setIdentifierColumn( "organisationunitid" );
- }
-
- @Override
- protected void setIdentifierValues( DataSetCompletenessResult result )
- {
- statementBuilder.setIdentifierValue( result.getDataSetId() );
- statementBuilder.setIdentifierValue( result.getPeriodId() );
- statementBuilder.setIdentifierValue( result.getOrganisationUnitId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "datasetid" );
- statementBuilder.setUniqueColumn( "periodid" );
- statementBuilder.setUniqueColumn( "organisationunitid" );
- }
-
- @Override
- protected void setUniqueValues( DataSetCompletenessResult result )
- {
- statementBuilder.setUniqueValue( result.getDataSetId() );
- statementBuilder.setUniqueValue( result.getPeriodId() );
- statementBuilder.setUniqueValue( result.getOrganisationUnitId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "datasetid" );
- statementBuilder.setColumn( "periodid" );
- statementBuilder.setColumn( "periodname" );
- statementBuilder.setColumn( "organisationunitid" );
- statementBuilder.setColumn( "sources" );
- statementBuilder.setColumn( "registrations" );
- statementBuilder.setColumn( "registrationsOnTime" );
- statementBuilder.setColumn( "value" );
- statementBuilder.setColumn( "valueOnTime" );
- }
-
- @Override
- protected void setValues( DataSetCompletenessResult result )
- {
- statementBuilder.setValue( result.getDataSetId() );
- statementBuilder.setValue( result.getPeriodId() );
- statementBuilder.setValue( result.getPeriodName() );
- statementBuilder.setValue( result.getOrganisationUnitId() );
- statementBuilder.setValue( result.getSources() );
- statementBuilder.setValue( result.getRegistrations() );
- statementBuilder.setValue( result.getRegistrationsOnTime() );
- statementBuilder.setValue( result.getPercentage() );
- statementBuilder.setValue( result.getPercentageOnTime() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetMemberBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: DataSetMemberBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class DataSetMemberBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataSetMemberBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "datasetmembers" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "datasetid" );
- statementBuilder.setUniqueColumn( "dataelementid" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "datasetid" );
- statementBuilder.setColumn( "dataelementid" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/DataSetSourceAssociationBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-import org.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/*
- * 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.
- */
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class DataSetSourceAssociationBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public DataSetSourceAssociationBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "datasetsource" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "datasetid" );
- statementBuilder.setUniqueColumn( "sourceid" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "datasetid" );
- statementBuilder.setColumn( "sourceid" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,112 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.organisationunit.OrganisationUnitGroupSet;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: GroupSetBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class GroupSetBatchHandler
- extends AbstractBatchHandler<OrganisationUnitGroupSet>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public GroupSetBatchHandler( JdbcConfiguration config )
- {
- super( config, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "orgunitgroupset" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "orgunitgroupsetid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "orgunitgroupsetid" );
- }
-
- @Override
- protected void setIdentifierValues( OrganisationUnitGroupSet groupSet )
- {
- statementBuilder.setIdentifierValue( groupSet.getId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- }
-
- @Override
- protected void setUniqueValues( OrganisationUnitGroupSet groupSet )
- {
- statementBuilder.setUniqueValue( groupSet.getName() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "name" );
- statementBuilder.setColumn( "description" );
- statementBuilder.setColumn( "compulsory" );
- statementBuilder.setColumn( "datadimension" );
- }
-
- @Override
- protected void setValues( OrganisationUnitGroupSet groupSet )
- {
- statementBuilder.setValue( groupSet.getUid() );
- statementBuilder.setValue( groupSet.getCode() );
- statementBuilder.setValue( groupSet.getName() );
- statementBuilder.setValue( groupSet.getDescription() );
- statementBuilder.setValue( groupSet.isCompulsory() );
- statementBuilder.setValue( groupSet.isDataDimension() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/GroupSetMemberBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: GroupSetMemberBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class GroupSetMemberBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public GroupSetMemberBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "orgunitgroupsetmembers" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "orgunitgroupsetid" );
- statementBuilder.setUniqueColumn( "orgunitgroupid" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "orgunitgroupsetid" );
- statementBuilder.setColumn( "orgunitgroupid" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/ImportDataValueBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,124 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.ImportDataValue;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: ImportDataValueBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class ImportDataValueBatchHandler
- extends AbstractBatchHandler<ImportDataValue>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public ImportDataValueBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "importdatavalue" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "dataelementid" );
- statementBuilder.setIdentifierColumn( "categoryoptioncomboid" );
- statementBuilder.setIdentifierColumn( "periodid" );
- statementBuilder.setIdentifierColumn( "sourceid" );
- }
-
- @Override
- protected void setIdentifierValues( ImportDataValue value )
- {
- statementBuilder.setIdentifierValue( value.getDataElementId() );
- statementBuilder.setIdentifierValue( value.getCategoryOptionComboId() );
- statementBuilder.setIdentifierValue( value.getPeriodId() );
- statementBuilder.setIdentifierValue( value.getSourceId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "dataelementid" );
- statementBuilder.setUniqueColumn( "categoryoptioncomboid" );
- statementBuilder.setUniqueColumn( "periodid" );
- statementBuilder.setUniqueColumn( "sourceid" );
- }
-
- @Override
- protected void setUniqueValues( ImportDataValue value )
- {
- statementBuilder.setUniqueValue( value.getDataElementId() );
- statementBuilder.setUniqueValue( value.getCategoryOptionComboId() );
- statementBuilder.setUniqueValue( value.getPeriodId() );
- statementBuilder.setUniqueValue( value.getSourceId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "dataelementid" );
- statementBuilder.setColumn( "categoryoptioncomboid" );
- statementBuilder.setColumn( "periodid" );
- statementBuilder.setColumn( "sourceid" );
- statementBuilder.setColumn( "value" );
- statementBuilder.setColumn( "storedby" );
- statementBuilder.setColumn( "lastupdated" );
- statementBuilder.setColumn( "comment" );
- statementBuilder.setColumn( "status" );
- }
-
- @Override
- protected void setValues( ImportDataValue value )
- {
- statementBuilder.setValue( value.getDataElementId() );
- statementBuilder.setValue( value.getCategoryOptionComboId() );
- statementBuilder.setValue( value.getPeriodId() );
- statementBuilder.setValue( value.getSourceId() );
- statementBuilder.setValue( value.getValue() );
- statementBuilder.setValue( value.getStoredBy() );
- statementBuilder.setValue( value.getTimestamp() );
- statementBuilder.setValue( value.getComment() );
- statementBuilder.setValue( value.getStatus() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.indicator.Indicator;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: IndicatorBatchHandler.java 5811 2008-10-03 18:36:11Z larshelg $
- */
-public class IndicatorBatchHandler
- extends AbstractBatchHandler<Indicator>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public IndicatorBatchHandler( JdbcConfiguration config )
- {
- super( config, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "indicator" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "indicatorid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "indicatorid" );
- }
-
- @Override
- protected void setIdentifierValues( Indicator indicator )
- {
- statementBuilder.setIdentifierValue( indicator.getId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- statementBuilder.setUniqueColumn( "shortname" );
- statementBuilder.setUniqueColumn( "code" );
- }
-
- @Override
- protected void setUniqueValues( Indicator indicator )
- {
- statementBuilder.setUniqueValue( indicator.getName() );
- statementBuilder.setUniqueValue( indicator.getShortName() );
- statementBuilder.setUniqueValue( indicator.getCode() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "name" );
- statementBuilder.setColumn( "shortname" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "description" );
- statementBuilder.setColumn( "annualized" );
- statementBuilder.setColumn( "indicatortypeid" );
- statementBuilder.setColumn( "numerator" );
- statementBuilder.setColumn( "numeratordescription" );
- statementBuilder.setColumn( "denominator" );
- statementBuilder.setColumn( "denominatordescription" );
- }
-
- @Override
- protected void setValues( Indicator indicator )
- {
- statementBuilder.setValue( indicator.getUid() );
- statementBuilder.setValue( indicator.getName() );
- statementBuilder.setValue( indicator.getShortName() );
- statementBuilder.setValue( indicator.getCode() );
- statementBuilder.setValue( indicator.getDescription() );
- statementBuilder.setValue( indicator.isAnnualized() );
- statementBuilder.setValue( indicator.getIndicatorType().getId() );
- statementBuilder.setValue( indicator.getNumerator() );
- statementBuilder.setValue( indicator.getNumeratorDescription() );
- statementBuilder.setValue( indicator.getDenominator() );
- statementBuilder.setValue( indicator.getDenominatorDescription() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.indicator.IndicatorGroup;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: IndicatorGroupBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class IndicatorGroupBatchHandler
- extends AbstractBatchHandler<IndicatorGroup>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public IndicatorGroupBatchHandler( JdbcConfiguration config )
- {
- super( config, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "indicatorgroup" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "indicatorgroupid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "indicatorgroupid" );
- }
-
- @Override
- protected void setIdentifierValues( IndicatorGroup group )
- {
- statementBuilder.setIdentifierValue( group.getId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- }
-
- @Override
- protected void setUniqueValues( IndicatorGroup group )
- {
- statementBuilder.setUniqueValue( group.getName() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "name" );
- }
-
- @Override
- protected void setValues( IndicatorGroup group )
- {
- statementBuilder.setValue( group.getUid() );
- statementBuilder.setValue( group.getCode() );
- statementBuilder.setValue( group.getName() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupMemberBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: IndicatorGroupMemberBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class IndicatorGroupMemberBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public IndicatorGroupMemberBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "indicatorgroupmembers" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "indicatorgroupid" );
- statementBuilder.setUniqueColumn( "indicatorid" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "indicatorgroupid" );
- statementBuilder.setColumn( "indicatorid" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
-
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,106 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.indicator.IndicatorGroupSet;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class IndicatorGroupSetBatchHandler
- extends AbstractBatchHandler<IndicatorGroupSet>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public IndicatorGroupSetBatchHandler( JdbcConfiguration config )
- {
- super( config, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "indicatorgroupset" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "indicatorgroupsetid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "indicatorgroupsetid" );
- }
-
- @Override
- protected void setIdentifierValues( IndicatorGroupSet groupSet )
- {
- statementBuilder.setIdentifierValue( groupSet.getId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- }
-
- @Override
- protected void setUniqueValues( IndicatorGroupSet groupSet )
- {
- statementBuilder.setUniqueValue( groupSet.getName() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "name" );
- }
-
- @Override
- protected void setValues( IndicatorGroupSet groupSet )
- {
- statementBuilder.setValue( groupSet.getUid() );
- statementBuilder.setValue( groupSet.getCode() );
- statementBuilder.setValue( groupSet.getName() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorGroupSetMemberBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id$
- */
-public class IndicatorGroupSetMemberBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public IndicatorGroupSetMemberBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "indicatorgroupsetmembers" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "indicatorgroupsetid" );
- statementBuilder.setUniqueColumn( "sort_order" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getSortOrder() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "indicatorgroupsetid" );
- statementBuilder.setColumn( "indicatorgroupid" );
- statementBuilder.setColumn( "sort_order" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- statementBuilder.setValue( association.getSortOrder() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/IndicatorTypeBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.indicator.IndicatorType;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: IndicatorTypeBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class IndicatorTypeBatchHandler
- extends AbstractBatchHandler<IndicatorType>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public IndicatorTypeBatchHandler( JdbcConfiguration config )
- {
- super( config, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "indicatortype" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "indicatortypeid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "indicatortypeid" );
- }
-
- @Override
- protected void setIdentifierValues( IndicatorType type )
- {
- statementBuilder.setIdentifierValue( type.getId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- }
-
- @Override
- protected void setUniqueValues( IndicatorType type )
- {
- statementBuilder.setUniqueValue( type.getName() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "name" );
- statementBuilder.setColumn( "indicatorfactor" );
- statementBuilder.setColumn( "indicatornumber" );
- }
-
- @Override
- protected void setValues( IndicatorType type )
- {
- statementBuilder.setValue( type.getUid() );
- statementBuilder.setValue( type.getCode() );
- statementBuilder.setValue( type.getName() );
- statementBuilder.setValue( type.getFactor() );
- statementBuilder.setValue( type.isNumber() );
-
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.organisationunit.OrganisationUnitGroup;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: OrganisationUnitGroupBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class OrganisationUnitGroupBatchHandler
- extends AbstractBatchHandler<OrganisationUnitGroup>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public OrganisationUnitGroupBatchHandler( JdbcConfiguration config )
- {
- super( config, false );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "orgunitgroup" );
- }
-
- @Override
- protected void setAutoIncrementColumn()
- {
- statementBuilder.setAutoIncrementColumn( "orgunitgroupid" );
- }
-
- @Override
- protected void setIdentifierColumns()
- {
- statementBuilder.setIdentifierColumn( "orgunitgroupid" );
- }
-
- @Override
- protected void setIdentifierValues( OrganisationUnitGroup group )
- {
- statementBuilder.setIdentifierValue( group.getId() );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "name" );
- }
-
- @Override
- protected void setUniqueValues( OrganisationUnitGroup group )
- {
- statementBuilder.setUniqueValue( group.getName() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "uid" );
- statementBuilder.setColumn( "code" );
- statementBuilder.setColumn( "name" );
- statementBuilder.setColumn( "shortname" );
- }
-
- @Override
- protected void setValues( OrganisationUnitGroup group )
- {
- statementBuilder.setValue( group.getUid() );
- statementBuilder.setValue( group.getCode() );
- statementBuilder.setValue( group.getName() );
- statementBuilder.setValue( group.getShortName() );
- }
-}
=== removed file 'dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java'
--- dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java 2015-10-02 11:27:19 +0000
+++ dhis-2/dhis-support/dhis-support-jdbc/src/main/java/org/hisp/dhis/jdbc/batchhandler/OrganisationUnitGroupMemberBatchHandler.java 1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-package org.hisp.dhis.jdbc.batchhandler;
-
-/*
- * 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.amplecode.quick.JdbcConfiguration;
-import org.amplecode.quick.batchhandler.AbstractBatchHandler;
-import org.hisp.dhis.importexport.GroupMemberAssociation;
-
-/**
- * @author Lars Helge Overland
- * @version $Id: OrganisationUnitGroupMemberBatchHandler.java 5062 2008-05-01 18:10:35Z larshelg $
- */
-public class OrganisationUnitGroupMemberBatchHandler
- extends AbstractBatchHandler<GroupMemberAssociation>
-{
- // -------------------------------------------------------------------------
- // Constructor
- // -------------------------------------------------------------------------
-
- public OrganisationUnitGroupMemberBatchHandler( JdbcConfiguration config )
- {
- super( config, true );
- }
-
- // -------------------------------------------------------------------------
- // AbstractBatchHandler implementation
- // -------------------------------------------------------------------------
-
- @Override
- protected void setTableName()
- {
- statementBuilder.setTableName( "orgunitgroupmembers" );
- }
-
- @Override
- protected void setUniqueColumns()
- {
- statementBuilder.setUniqueColumn( "orgunitgroupid" );
- statementBuilder.setUniqueColumn( "organisationunitid" );
- }
-
- @Override
- protected void setUniqueValues( GroupMemberAssociation association )
- {
- statementBuilder.setUniqueValue( association.getGroupId() );
- statementBuilder.setUniqueValue( association.getMemberId() );
- }
-
- @Override
- protected void setColumns()
- {
- statementBuilder.setColumn( "orgunitgroupid" );
- statementBuilder.setColumn( "organisationunitid" );
- }
-
- @Override
- protected void setValues( GroupMemberAssociation association )
- {
- statementBuilder.setValue( association.getGroupId() );
- statementBuilder.setValue( association.getMemberId() );
- }
-}
-
=== modified file 'dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java'
--- dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2015-10-05 07:55:19 +0000
+++ dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/DhisConvenienceTest.java 2015-10-05 17:23:54 +0000
@@ -53,8 +53,6 @@
import org.hisp.dhis.expression.Expression;
import org.hisp.dhis.expression.Operator;
import org.hisp.dhis.external.location.LocationManager;
-import org.hisp.dhis.importexport.ImportDataValue;
-import org.hisp.dhis.importexport.ImportObjectStatus;
import org.hisp.dhis.indicator.Indicator;
import org.hisp.dhis.indicator.IndicatorGroup;
import org.hisp.dhis.indicator.IndicatorGroupSet;
@@ -1030,32 +1028,6 @@
return expression;
}
- /**
- * @param dataElementId The data element identifier.
- * @param categoryOptionComboId The data element category option combo
- * identifier.
- * @param periodId The period identifier.
- * @param sourceId The source identifier.
- * @param status The status.
- */
- public static ImportDataValue createImportDataValue( int dataElementId, int categoryOptionComboId, int periodId,
- int sourceId, ImportObjectStatus status )
- {
- ImportDataValue importDataValue = new ImportDataValue();
-
- importDataValue.setDataElementId( dataElementId );
- importDataValue.setCategoryOptionComboId( categoryOptionComboId );
- importDataValue.setPeriodId( periodId );
- importDataValue.setSourceId( sourceId );
- importDataValue.setValue( String.valueOf( 10 ) );
- importDataValue.setStoredBy( "StoredBy" );
- importDataValue.setTimestamp( new Date() );
- importDataValue.setComment( "Comment" );
- importDataValue.setStatus( status.name() );
-
- return importDataValue;
- }
-
public static Legend createLegend( char uniqueCharacter, Double startValue, Double endValue )
{
Legend legend = new Legend();
