dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #15024
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 5259: Removed unused methods
------------------------------------------------------------
revno: 5259
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2011-12-01 17:05:30 +0100
message:
Removed unused methods
modified:
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/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-12-01 15:43:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueService.java 2011-12-01 16:05:30 +0000
@@ -337,25 +337,6 @@
*/
Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, int periodId, Collection<Integer> organisationUnitIds );
- /**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- * @param OrganisationUnitId the id of the organisationUnit.
- */
- Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level, int organisationUnitId );
-
- /**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- */
- Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, Collection<Integer> periodIds, int level, int organisationUnitId );
-
// ----------------------------------------------------------------------
// DataValue
// ----------------------------------------------------------------------
=== 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 2011-12-01 15:43:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/aggregation/AggregatedDataValueStore.java 2011-12-01 16:05:30 +0000
@@ -314,25 +314,6 @@
*/
Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, int periodId, Collection<Integer> organisationUnitIds );
- /**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- * @param OrganisationUnitId the id of the organisationUnit.
- */
- Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level, int organisationUnitId );
-
- /**
- * Retrieves the AggregatedIndicatorMapValues for the given arguments.
- *
- * @param indicatorId the Indicator identifier.
- * @param periodId the Period identifier.
- * @param level the OrganisationUnit level.
- */
- Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, Collection<Integer> periodIds, int level, int organisationUnitId );
-
// ----------------------------------------------------------------------
// DataValue
// ----------------------------------------------------------------------
=== 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 2011-12-01 15:43:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/DefaultAggregatedDataValueService.java 2011-12-01 16:05:30 +0000
@@ -217,16 +217,6 @@
return aggregatedDataValueStore.getAggregatedIndicatorMapValues( indicatorId, periodId, organisationUnitIds );
}
- public Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level, int organisationUnitId )
- {
- return aggregatedDataValueStore.getAggregatedIndicatorMapValues( indicatorId, periodId, level, organisationUnitId );
- }
-
- public Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, Collection<Integer> periodIds, int level, int organisationUnitId )
- {
- return aggregatedDataValueStore.getAggregatedIndicatorMapValues( indicatorId, periodIds, level, organisationUnitId );
- }
-
// -------------------------------------------------------------------------
// DataValue
// -------------------------------------------------------------------------
=== 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 2011-12-01 15:43:25 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/aggregation/jdbc/JdbcAggregatedDataValueStore.java 2011-12-01 16:05:30 +0000
@@ -634,68 +634,6 @@
return jdbcTemplate.query( sql, new AggregatedIndicatorMapValueRowMapper() );
}
- public Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, int periodId, int level, int organisationUnitId )
- {
- final StatementHolder holder = statementManager.getHolder();
-
- final ObjectMapper<AggregatedMapValue> mapper = new ObjectMapper<AggregatedMapValue>();
-
- try
- {
- final String sql =
- "SELECT o.organisationunitid, o.name, a.value, a.periodid, a.factor, a.numeratorvalue, a.denominatorvalue " +
- "FROM aggregatedindicatorvalue AS a, organisationunit AS o " +
- "WHERE a.indicatorid = " + indicatorId + " " +
- "AND a.periodid = " + periodId + " " +
- "AND a.level = " + level + " " +
- "AND a.organisationunitid = o.organisationunitid" +
- "AND o.organisationunitid = " + organisationUnitId;
-
- final ResultSet resultSet = holder.getStatement().executeQuery( sql );
-
- return mapper.getCollection( resultSet, new AggregatedIndicatorMapValueRowMapper() );
- }
- catch ( SQLException ex )
- {
- throw new RuntimeException( "Failed to get aggregated indicator map values", ex );
- }
- finally
- {
- holder.close();
- }
- }
-
- public Collection<AggregatedMapValue> getAggregatedIndicatorMapValues( int indicatorId, Collection<Integer> periodIds, int level, int organisationUnitId )
- {
- final StatementHolder holder = statementManager.getHolder();
-
- final ObjectMapper<AggregatedMapValue> mapper = new ObjectMapper<AggregatedMapValue>();
-
- try
- {
- final String sql =
- "SELECT o.organisationunitid, o.name, a.value, a.periodid, a.factor, a.numeratorvalue, a.denominatorvalue " +
- "FROM aggregatedindicatorvalue AS a, organisationunit AS o " +
- "WHERE a.indicatorid = " + indicatorId + " " +
- "AND a.periodid IN ( " + getCommaDelimitedString( periodIds ) + " ) " +
- "AND a.level = " + level + " " +
- "AND a.organisationunitid = o.organisationunitid " +
- "AND o.organisationunitid = " + organisationUnitId;
-
- final ResultSet resultSet = holder.getStatement().executeQuery( sql );
-
- return mapper.getCollection( resultSet, new AggregatedIndicatorMapValueRowMapper() );
- }
- catch ( SQLException ex )
- {
- throw new RuntimeException( "Failed to get aggregated indicator map values", ex );
- }
- finally
- {
- holder.close();
- }
- }
-
// -------------------------------------------------------------------------
// DataValue
// -------------------------------------------------------------------------
