dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #40623
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 20627: Removed unused methods
------------------------------------------------------------
revno: 20627
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-10-12 12:12:49 +0200
message:
Removed unused methods
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java
dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.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/chart/ChartService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2015-06-16 18:35:12 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java 2015-10-12 10:12:49 +0000
@@ -28,7 +28,6 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -102,8 +101,6 @@
Chart getChartByName( String name );
- List<Chart> getCharts( final Collection<Integer> identifiers );
-
List<Chart> getChartsBetween( int first, int max );
List<Chart> getChartsBetweenByName( String name, int first, int max );
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2015-09-22 10:27:46 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryService.java 2015-10-12 10:12:49 +0000
@@ -99,15 +99,6 @@
DataElementCategory getDataElementCategory( String uid );
/**
- * Retrieves the DataElementCategories with the given identifiers.
- *
- * @param identifiers the identifiers of the DataElementCategories to
- * retrieve.
- * @return a list of DataElementCategories.
- */
- List<DataElementCategory> getDataElementCategories( Collection<Integer> identifiers );
-
- /**
* Retrieves the DataElementCategories with the given uids.
*
* @param uids the uids of the DataElementCategories to retrieve.
@@ -213,15 +204,6 @@
DataElementCategoryOption getDataElementCategoryOption( String uid );
/**
- * Retrieves the DataElementCategoryOptions with the given identifiers.
- *
- * @param identifiers the identifiers of the DataElementCategoryOption to
- * retrieve.
- * @return a list of DataElementCategoryOptions.
- */
- List<DataElementCategoryOption> getDataElementCategoryOptions( Collection<Integer> identifiers );
-
- /**
* Retrieves the DataElementCategoryOptions with the given uids.
*
* @param uids the uids of the DataElementCategoryOption to retrieve.
@@ -313,14 +295,6 @@
DataElementCategoryCombo getDataElementCategoryCombo( String uid );
/**
- * Retrieves the DataElementCategoryCombo with the given identifiers.
- *
- * @param identifiers the identifiers.
- * @return a list of DataElementCategoryCombos.
- */
- List<DataElementCategoryCombo> getDataElementCategoryCombos( Collection<Integer> identifiers );
-
- /**
* Retrieves the DataElementCategoryCombo with the given name.
*
* @param name the name of the DataElementCategoryCombo to retrieve.
@@ -424,15 +398,6 @@
DataElementCategoryOptionCombo getDataElementCategoryOptionComboByCode( String code );
/**
- * Retrieves the DataElementCategoryOptionCombos with the given identifiers.
- *
- * @param identifiers the identifiers of the
- * DataElementCategoryOptionCombos.
- * @return a list of DataElementCategoryOptionCombos.
- */
- List<DataElementCategoryOptionCombo> getDataElementCategoryOptionCombos( Collection<Integer> identifiers );
-
- /**
* Retrieves the DataElementCategoryOptionCombos with the given uids.
*
* @param uids the uids of the
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2015-09-16 14:49:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataset/DataSetService.java 2015-10-12 10:12:49 +0000
@@ -177,14 +177,6 @@
List<DataSet> getDataSetsByPeriodType( PeriodType periodType );
/**
- * Get all DataSets with corresponding identifiers.
- *
- * @param identifiers the collection of identifiers.
- * @return a list of indicators.
- */
- List<DataSet> getDataSets( Collection<Integer> identifiers );
-
- /**
* Returns a list of data sets with the given uids.
*
* @param uids the collection of uids.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitGroupService.java 2015-10-12 10:12:49 +0000
@@ -77,14 +77,6 @@
OrganisationUnitGroup getOrganisationUnitGroup( int id );
/**
- * Returns the OrganisationUnitGroup with the given identifiers.
- *
- * @param identifiers the list of identifiers.
- * @return the OrganisationUnitGroup with the given identifiers.
- */
- List<OrganisationUnitGroup> getOrganisationUnitGroups( Collection<Integer> identifiers );
-
- /**
* Returns the OrganisationUnitGroups with the given UIDs.
*
* @param uids the collection of UIDs.
@@ -197,14 +189,6 @@
OrganisationUnitGroupSet getOrganisationUnitGroupSet( String uid );
/**
- * Returns the OrganisationUnitGroupSets with the given identifiers.
- *
- * @param identifiers the identifiers.
- * @return the OrganisationUnitGroupSets with the given identifiers.
- */
- List<OrganisationUnitGroupSet> getOrganisationUnitGroupSets( Collection<Integer> identifiers );
-
- /**
* Returns the OrganisationUnitGroupSets with the given uids.
*
* @param uids the collection of uids.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2015-10-08 14:29:41 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/organisationunit/OrganisationUnitService.java 2015-10-12 10:12:49 +0000
@@ -415,8 +415,6 @@
OrganisationUnitLevel getOrganisationUnitLevel( String uid );
- List<OrganisationUnitLevel> getOrganisationUnitLevels( Collection<Integer> identifiers );
-
void deleteOrganisationUnitLevel( OrganisationUnitLevel level );
void deleteOrganisationUnitLevels();
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-09-16 15:14:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java 2015-10-12 10:12:49 +0000
@@ -30,7 +30,6 @@
import java.io.OutputStream;
import java.io.Writer;
-import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -173,14 +172,6 @@
List<Report> getReportByName( String name );
/**
- * Retrieves all Reports with the given identifiers.
- *
- * @param identifiers the Collection of identifiers.
- * @return a Collection of Reports.
- */
- List<Report> getReports( Collection<Integer> identifiers );
-
- /**
* Retrieves Reports with the given uids.
*
* @param uids the list of uids.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-09-16 14:49:50 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/reporttable/ReportTableService.java 2015-10-12 10:12:49 +0000
@@ -28,6 +28,9 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+import java.util.Date;
+import java.util.List;
+
import org.hisp.dhis.common.Grid;
import org.hisp.dhis.dataelement.CategoryOptionGroup;
import org.hisp.dhis.dataelement.DataElement;
@@ -37,10 +40,6 @@
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.period.Period;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-
/**
* @author Lars Helge Overland
* @version $Id$
@@ -106,14 +105,6 @@
List<ReportTable> getAllReportTables();
/**
- * Retrieves ReportTables with the given identifiers.
- *
- * @param reportTables the identifiers of the ReportTables to retrieve.
- * @return a Collection of ReportTables.
- */
- List<ReportTable> getReportTables( Collection<Integer> reportTables );
-
- /**
* Retrieves ReportTables with the given uids.
*
* @param uids the list of uids.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/validation/ValidationRuleService.java 2015-10-12 10:12:49 +0000
@@ -163,14 +163,6 @@
ValidationRule getValidationRule( String uid );
/**
- * Get the ValidationRules with the corresponding identifiers.
- *
- * @param identifiers the collection of identifiers.
- * @return a collection of validation rules.
- */
- List<ValidationRule> getValidationRules( Collection<Integer> identifiers );
-
- /**
* Get all validation rules.
*
* @return a List of ValidationRule or null if it there are no validation rules.
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java 2015-10-12 09:16:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java 2015-10-12 10:12:49 +0000
@@ -427,7 +427,7 @@
@SuppressWarnings( "unchecked" )
public List<T> getById( Collection<Integer> ids )
{
- if ( ids == null ||ids.isEmpty() )
+ if ( ids == null || ids.isEmpty() )
{
return new ArrayList<>();
}
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2015-09-22 10:27:46 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java 2015-10-12 10:12:49 +0000
@@ -45,8 +45,6 @@
import org.hisp.dhis.common.IdentifiableObjectManager;
import org.hisp.dhis.common.IdentifiableObjectUtils;
import org.hisp.dhis.common.IdentifiableProperty;
-import org.hisp.dhis.commons.filter.Filter;
-import org.hisp.dhis.commons.filter.FilterUtils;
import org.hisp.dhis.i18n.I18nService;
import org.springframework.transaction.annotation.Transactional;
@@ -185,21 +183,6 @@
}
@Override
- public List<DataElementCategory> getDataElementCategories( final Collection<Integer> identifiers )
- {
- List<DataElementCategory> categories = getAllDataElementCategories();
-
- return identifiers == null ? categories : FilterUtils.filter( categories, new Filter<DataElementCategory>()
- {
- @Override
- public boolean retain( DataElementCategory object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<DataElementCategory> getDataElementCategoriesByUid( Collection<String> uids )
{
return i18n( i18nService, categoryStore.getByUid( uids ) );
@@ -338,22 +321,6 @@
}
@Override
- public List<DataElementCategoryOption> getDataElementCategoryOptions( final Collection<Integer> identifiers )
- {
- List<DataElementCategoryOption> categoryOptions = getAllDataElementCategoryOptions();
-
- return identifiers == null ? categoryOptions : FilterUtils.filter( categoryOptions,
- new Filter<DataElementCategoryOption>()
- {
- @Override
- public boolean retain( DataElementCategoryOption object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<DataElementCategoryOption> getDataElementCategoryOptionsByUid( Collection<String> uids )
{
return i18n( i18nService, categoryOptionStore.getByUid( uids ) );
@@ -437,22 +404,6 @@
}
@Override
- public List<DataElementCategoryCombo> getDataElementCategoryCombos( final Collection<Integer> identifiers )
- {
- List<DataElementCategoryCombo> categoryCombos = getAllDataElementCategoryCombos();
-
- return identifiers == null ? categoryCombos : FilterUtils.filter( categoryCombos,
- new Filter<DataElementCategoryCombo>()
- {
- @Override
- public boolean retain( DataElementCategoryCombo object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public DataElementCategoryCombo getDataElementCategoryComboByName( String name )
{
return i18n( i18nService, categoryComboStore.getByName( name ) );
@@ -577,23 +528,6 @@
}
@Override
- public List<DataElementCategoryOptionCombo> getDataElementCategoryOptionCombos(
- final Collection<Integer> identifiers )
- {
- List<DataElementCategoryOptionCombo> categoryOptionCombos = getAllDataElementCategoryOptionCombos();
-
- return identifiers == null ? categoryOptionCombos : FilterUtils.filter( categoryOptionCombos,
- new Filter<DataElementCategoryOptionCombo>()
- {
- @Override
- public boolean retain( DataElementCategoryOptionCombo object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<DataElementCategoryOptionCombo> getDataElementCategoryOptionCombosByUid( Collection<String> uids )
{
return categoryOptionComboStore.getByUid( uids );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2015-09-13 14:54:57 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2015-10-12 10:12:49 +0000
@@ -39,8 +39,6 @@
import java.util.List;
import java.util.Set;
-import org.hisp.dhis.commons.filter.Filter;
-import org.hisp.dhis.commons.filter.FilterUtils;
import org.hisp.dhis.dataapproval.DataApprovalService;
import org.hisp.dhis.dataapproval.DataApprovalStatus;
import org.hisp.dhis.dataelement.DataElement;
@@ -238,21 +236,6 @@
}
@Override
- public List<DataSet> getDataSets( final Collection<Integer> identifiers )
- {
- List<DataSet> dataSets = getAllDataSets();
-
- return identifiers == null ? dataSets : FilterUtils.filter( dataSets, new Filter<DataSet>()
- {
- @Override
- public boolean retain( DataSet object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<DataSet> getDataSetsByUid( Collection<String> uids )
{
return dataSetStore.getByUid( uids );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitGroupService.java 2015-10-12 10:12:49 +0000
@@ -122,21 +122,6 @@
}
@Override
- public List<OrganisationUnitGroup> getOrganisationUnitGroups( final Collection<Integer> identifiers )
- {
- List<OrganisationUnitGroup> objects = getAllOrganisationUnitGroups();
-
- return identifiers == null ? objects : FilterUtils.filter( objects, new Filter<OrganisationUnitGroup>()
- {
- @Override
- public boolean retain( OrganisationUnitGroup object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<OrganisationUnitGroup> getOrganisationUnitGroupsByUid( Collection<String> uids )
{
return i18n( i18nService, organisationUnitGroupStore.getByUid( uids ) );
@@ -259,21 +244,6 @@
}
@Override
- public List<OrganisationUnitGroupSet> getOrganisationUnitGroupSets( final Collection<Integer> identifiers )
- {
- List<OrganisationUnitGroupSet> objects = getAllOrganisationUnitGroupSets();
-
- return identifiers == null ? objects : FilterUtils.filter( objects, new Filter<OrganisationUnitGroupSet>()
- {
- @Override
- public boolean retain( OrganisationUnitGroupSet object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<OrganisationUnitGroupSet> getOrganisationUnitGroupSetsByUid( Collection<String> uids )
{
return i18n( i18nService, organisationUnitGroupSetStore.getByUid( uids ) );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2015-10-12 09:16:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java 2015-10-12 10:12:49 +0000
@@ -46,7 +46,6 @@
import org.apache.commons.lang3.ObjectUtils;
import org.hisp.dhis.common.IdentifiableObjectUtils;
import org.hisp.dhis.common.OrganisationUnitSelectionMode;
-import org.hisp.dhis.commons.filter.Filter;
import org.hisp.dhis.commons.filter.FilterUtils;
import org.hisp.dhis.configuration.ConfigurationService;
import org.hisp.dhis.hierarchy.HierarchyViolationException;
@@ -609,21 +608,6 @@
}
@Override
- public List<OrganisationUnitLevel> getOrganisationUnitLevels( final Collection<Integer> identifiers )
- {
- List<OrganisationUnitLevel> objects = getOrganisationUnitLevels();
-
- return identifiers == null ? objects : FilterUtils.filter( objects, new Filter<OrganisationUnitLevel>()
- {
- @Override
- public boolean retain( OrganisationUnitLevel object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public void deleteOrganisationUnitLevel( OrganisationUnitLevel organisationUnitLevel )
{
organisationUnitLevelStore.delete( organisationUnitLevel );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java 2015-10-06 18:24:42 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/validation/DefaultValidationRuleService.java 2015-10-12 10:12:49 +0000
@@ -32,7 +32,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
-import org.hisp.dhis.commons.filter.Filter;
import org.hisp.dhis.commons.filter.FilterUtils;
import org.hisp.dhis.constant.ConstantService;
import org.hisp.dhis.dataelement.DataElement;
@@ -666,21 +665,6 @@
}
@Override
- public List<ValidationRule> getValidationRules( final Collection<Integer> identifiers )
- {
- List<ValidationRule> objects = getAllValidationRules();
-
- return identifiers == null ? objects : FilterUtils.filter( objects, new Filter<ValidationRule>()
- {
- @Override
- public boolean retain( ValidationRule object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<ValidationRule> getValidationRulesByName( String name )
{
return getObjectsByName( i18nService, validationRuleStore, name );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2015-09-15 11:21:39 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java 2015-10-12 10:12:49 +0000
@@ -35,7 +35,6 @@
import java.awt.Color;
import java.awt.Font;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
@@ -79,8 +78,6 @@
import org.hisp.dhis.period.RelativePeriods;
import org.hisp.dhis.system.grid.GridUtils;
import org.hisp.dhis.system.util.MathUtils;
-import org.hisp.dhis.commons.filter.Filter;
-import org.hisp.dhis.commons.filter.FilterUtils;
import org.hisp.dhis.user.CurrentUserService;
import org.hisp.dhis.user.User;
import org.jfree.chart.ChartFactory;
@@ -961,21 +958,6 @@
}
@Override
- public List<Chart> getCharts( final Collection<Integer> identifiers )
- {
- List<Chart> charts = getAllCharts();
-
- return identifiers == null ? charts : FilterUtils.filter( charts, new Filter<Chart>()
- {
- @Override
- public boolean retain( Chart object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public int getChartCount()
{
return chartStore.getCount();
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2015-09-16 18:31:45 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/report/impl/DefaultReportService.java 2015-10-12 10:12:49 +0000
@@ -36,7 +36,6 @@
import java.nio.charset.StandardCharsets;
import java.sql.Connection;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -55,8 +54,6 @@
import org.hisp.dhis.common.GenericIdentifiableObjectStore;
import org.hisp.dhis.common.Grid;
import org.hisp.dhis.common.IdentifiableObjectUtils;
-import org.hisp.dhis.commons.filter.Filter;
-import org.hisp.dhis.commons.filter.FilterUtils;
import org.hisp.dhis.commons.util.Encoder;
import org.hisp.dhis.constant.ConstantService;
import org.hisp.dhis.i18n.I18nFormat;
@@ -353,21 +350,6 @@
}
@Override
- public List<Report> getReports( final Collection<Integer> identifiers )
- {
- List<Report> reports = getAllReports();
-
- return identifiers == null ? reports : FilterUtils.filter( reports, new Filter<Report>()
- {
- @Override
- public boolean retain( Report object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<Report> getReportsByUid( List<String> uids )
{
return reportStore.getByUid( uids );
=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2015-06-16 18:35:12 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/reporttable/impl/DefaultReportTableService.java 2015-10-12 10:12:49 +0000
@@ -29,7 +29,6 @@
*/
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -49,8 +48,6 @@
import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.reporttable.ReportTableService;
import org.hisp.dhis.system.grid.ListGrid;
-import org.hisp.dhis.commons.filter.Filter;
-import org.hisp.dhis.commons.filter.FilterUtils;
import org.hisp.dhis.user.CurrentUserService;
import org.springframework.transaction.annotation.Transactional;
@@ -187,21 +184,6 @@
}
@Override
- public List<ReportTable> getReportTables( final Collection<Integer> identifiers )
- {
- List<ReportTable> objects = getAllReportTables();
-
- return identifiers == null ? objects : FilterUtils.filter( objects, new Filter<ReportTable>()
- {
- @Override
- public boolean retain( ReportTable object )
- {
- return identifiers.contains( object.getId() );
- }
- } );
- }
-
- @Override
public List<ReportTable> getReportTablesByUid( List<String> uids )
{
return reportTableStore.getByUid( uids );
