dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10557
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-04-15 17:32:38 +0200
message:
  Removed unused method
modified:
  dhis-2/dhis-api/pom.xml
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.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/pom.xml'
--- dhis-2/dhis-api/pom.xml	2013-03-22 13:47:40 +0000
+++ dhis-2/dhis-api/pom.xml	2013-04-15 15:32:38 +0000
@@ -34,8 +34,7 @@
     <dependency>
       <groupId>net.sf.jasperreports</groupId>
       <artifactId>jasperreports</artifactId>
-    </dependency>
-	
+    </dependency>	
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java	2012-07-25 16:22:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java	2013-04-15 15:32:38 +0000
@@ -33,7 +33,6 @@
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOption;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.datavalue.DataValue;
 import org.hisp.dhis.datavalue.DeflatedDataValue;
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -333,15 +332,4 @@
      * @param sourceIds the Collection of Source identifiers.
      */
     Collection<DeflatedDataValue> getDeflatedDataValues( int dataElementId, int periodId, Collection<Integer> sourceIds );
-    
-    /**
-     * Gets a DataValues. Note that this is a "deflated" data value as the objects
-     * in the composite identifier only has its id property populated.
-     * 
-     * @param dataElementId the DataElement identifier.
-     * @param categoryOptionComboId the DataElementCategoryOptionCombo identifier.
-     * @param periodId the Period identifier.
-     * @param sourceId the Source identifier.
-     */
-    DataValue getDataValue( int dataElementId, int categoryOptionComboId, int periodId, int sourceId );
 }

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java	2012-07-25 16:22:03 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java	2013-04-15 15:32:38 +0000
@@ -32,7 +32,6 @@
 import org.hisp.dhis.completeness.DataSetCompletenessResult;
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOption;
-import org.hisp.dhis.datavalue.DataValue;
 import org.hisp.dhis.datavalue.DeflatedDataValue;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
@@ -311,15 +310,4 @@
      * @param sourceIds the Collection of Source identifiers.
      */
     Collection<DeflatedDataValue> getDeflatedDataValues( int dataElementId, int periodId, Collection<Integer> sourceIds );
-    
-    /**
-     * Gets a DataValues. Note that this is a "deflated" data value as the objects
-     * in the composite identifier only has its id property populated.
-     * 
-     * @param dataElementId the DataElement identifier.
-     * @param categoryOptionComboId the DataElementCategoryOptionCombo identifier.
-     * @param periodId the Period identifier.
-     * @param sourceId the Source identifier.
-     */
-    DataValue getDataValue( int dataElementId, int categoryOptionComboId, int periodId, int sourceId );
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java	2012-07-25 16:22:03 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java	2013-04-15 15:32:38 +0000
@@ -33,7 +33,6 @@
 import org.hisp.dhis.dataelement.DataElement;
 import org.hisp.dhis.dataelement.DataElementCategoryOption;
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
-import org.hisp.dhis.datavalue.DataValue;
 import org.hisp.dhis.datavalue.DeflatedDataValue;
 import org.hisp.dhis.indicator.Indicator;
 import org.hisp.dhis.organisationunit.OrganisationUnit;
@@ -223,9 +222,4 @@
     {
         return aggregatedDataValueStore.getDeflatedDataValues( dataElementId, periodId, sourceIds );
     }
-    
-    public DataValue getDataValue( int dataElementId, int categoryOptionComboId, int periodId, int sourceId )
-    {
-        return aggregatedDataValueStore.getDataValue( dataElementId, categoryOptionComboId, periodId, sourceId );
-    }
 }

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java	2013-04-15 14:01:14 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java	2013-04-15 15:32:38 +0000
@@ -483,16 +483,4 @@
         
         return jdbcTemplate.query( sql, new DeflatedDataValueRowMapper() );
     }
-    
-    public DataValue getDataValue( int dataElementId, int categoryOptionComboId, int periodId, int sourceId ) //TODO remove
-    {
-        final String sql =
-            "SELECT * FROM datavalue " +
-            "WHERE dataelementid = " + dataElementId + " " +
-            "AND categoryoptioncomboid = " + categoryOptionComboId + " " +
-            "AND periodid = " + periodId + " " +
-            "AND sourceid = " + sourceId;
-        
-        return jdbcTemplate.queryForObject( sql, new DataValueRowMapper() );
-    }
 }