=== 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-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/chart/ChartService.java	2015-06-16 10:36:25 +0000
@@ -98,7 +98,7 @@
 
     void deleteChart( Chart chart );
 
-    Collection<Chart> getAllCharts();
+    List<Chart> getAllCharts();
     
     Chart getChartByName( String name );
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java	2015-03-27 17:33:25 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java	2015-06-16 10:36:25 +0000
@@ -93,7 +93,7 @@
 
     <T extends IdentifiableObject> List<T> getBetweenLikeName( Class<T> clazz, Set<String> words, int first, int max );
 
-    <T extends IdentifiableObject> Collection<T> getByLastUpdated( Class<T> clazz, Date lastUpdated );
+    <T extends IdentifiableObject> List<T> getByLastUpdated( Class<T> clazz, Date lastUpdated );
 
     <T extends IdentifiableObject> Collection<T> getByCreated( Class<T> clazz, Date created );
 

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessService.java	2015-06-16 10:36:25 +0000
@@ -29,6 +29,7 @@
  */
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.Future;
 
@@ -58,12 +59,12 @@
      * 
      * @param periodId the identifier of the Period.
      * @param organisationUnitId the identifier of the root OrganisationUnit.
-     * @return a Collection of DataSetCompletenessResults.
+     * @return a List of DataSetCompletenessResults.
      */
-    Collection<DataSetCompletenessResult> getDataSetCompleteness( int periodId, int organisationUnitId, Set<Integer> groupIds );
+    List<DataSetCompletenessResult> getDataSetCompleteness( int periodId, int organisationUnitId, Set<Integer> groupIds );
 
     /**
-     * Returns a Collection of DataSetCompletenessResults. The
+     * Returns a List of DataSetCompletenessResults. The
      * DataSetCompletenessResult object contains the name of the associated
      * OrganisationUnit, the number of sources being associated with the DataSet
      * AND being a child of the OrganisationUnit, and the number of
@@ -75,9 +76,9 @@
      * @param parentOrganisationUnitId the identifier of the parent
      *        OrganisationUnit.
      * @param dataSetId the identifier of the DataSet.
-     * @return a Collection of DataSetCompletenessResults.
+     * @return a List of DataSetCompletenessResults.
      */
-    Collection<DataSetCompletenessResult> getDataSetCompleteness( int periodId,
+    List<DataSetCompletenessResult> getDataSetCompleteness( int periodId,
         Collection<Integer> organisationUnitIds, int dataSetId, Set<Integer> groupIds );
 
     /**

=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessStore.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/completeness/DataSetCompletenessStore.java	2015-06-16 10:36:25 +0000
@@ -31,6 +31,7 @@
 import org.hisp.dhis.dataset.DataSet;
 
 import java.util.Collection;
+import java.util.List;
 
 /**
  * @author Lars Helge Overland
@@ -48,7 +49,7 @@
 
     Integer getCompulsoryDataElementRegistrations( DataSet dataSet, Collection<Integer> children, Collection<Integer> periods, int completenessOffset );
 
-    Collection<DataSet> getDataSetsWithRegistrations( Collection<DataSet> dataSets );
+    List<DataSet> getDataSetsWithRegistrations( Collection<DataSet> dataSets );
 
     /**
      * Gets the percentage value for the datasetcompleteness with the given parameters.

=== 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-01-17 07:41:26 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/report/ReportService.java	2015-06-16 10:36:25 +0000
@@ -136,7 +136,7 @@
      *
      * @param first the start index.
      * @param max   the maximum number of reports.
-     * @return a collection of reports.
+     * @return a list of reports.
      */
     List<Report> getReportsBetween( int first, int max );
 
@@ -146,7 +146,7 @@
      *
      * @param first the start index.
      * @param max   the maximum number of reports.
-     * @return a collection of reports.
+     * @return a List of reports.
      */
     List<Report> getReportsBetweenByName( String name, int first, int max );
 
@@ -160,7 +160,7 @@
     /**
      * Retrieves all Reports.
      *
-     * @return a Collection of Reports.
+     * @return a List of Reports.
      */
     List<Report> getAllReports();
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2015-05-28 17:30:20 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2015-06-16 10:36:25 +0000
@@ -556,7 +556,7 @@
 
     @Override
     @SuppressWarnings( "unchecked" )
-    public <T extends IdentifiableObject> Collection<T> getByLastUpdated( Class<T> clazz, Date lastUpdated )
+    public <T extends IdentifiableObject> List<T> getByLastUpdated( Class<T> clazz, Date lastUpdated )
     {
         GenericIdentifiableObjectStore<IdentifiableObject> store = getIdentifiableObjectStore( clazz );
 
@@ -565,7 +565,7 @@
             return new ArrayList<>();
         }
 
-        return (Collection<T>) store.getAllGeLastUpdated( lastUpdated );
+        return (List<T>) store.getAllGeLastUpdated( lastUpdated );
     }
 
     @Override

=== 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-06-15 13:44:20 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/chart/impl/DefaultChartService.java	2015-06-16 10:36:25 +0000
@@ -957,7 +957,7 @@
     }
 
     @Override
-    public Collection<Chart> getAllCharts()
+    public List<Chart> getAllCharts()
     {
         return chartStore.getAll();
     }
@@ -971,7 +971,7 @@
     @Override
     public Collection<Chart> getCharts( final Collection<Integer> identifiers )
     {
-        Collection<Chart> charts = getAllCharts();
+        List<Chart> charts = getAllCharts();
 
         return identifiers == null ? charts : FilterUtils.filter( charts, new Filter<Chart>()
         {

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java	2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/impl/AbstractDataSetCompletenessService.java	2015-06-16 10:36:25 +0000
@@ -28,8 +28,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import static org.hisp.dhis.commons.util.ConversionUtils.getIdentifiers;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
@@ -41,6 +39,7 @@
 import org.amplecode.quick.BatchHandlerFactory;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.hisp.dhis.commons.util.ConversionUtils;
 import org.hisp.dhis.completeness.DataSetCompletenessResult;
 import org.hisp.dhis.completeness.DataSetCompletenessService;
 import org.hisp.dhis.completeness.DataSetCompletenessStore;
@@ -55,7 +54,6 @@
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
-import org.hisp.dhis.commons.util.ConversionUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -190,20 +188,20 @@
 
     @Override
     @Transactional
-    public Collection<DataSetCompletenessResult> getDataSetCompleteness( int periodId, int organisationUnitId, Set<Integer> groupIds )
+    public List<DataSetCompletenessResult> getDataSetCompleteness( int periodId, int organisationUnitId, Set<Integer> groupIds )
     {
         final Period period = periodService.getPeriod( periodId );
 
         final Set<Integer> children = organisationUnitService.getOrganisationUnitHierarchy().getChildren(
             organisationUnitId );
 
-        final Collection<DataSet> dataSets = dataSetService.getAllDataSets();
+        final List<DataSet> dataSets = dataSetService.getAllDataSets();
 
         final List<DataSetCompletenessResult> results = new ArrayList<>();
 
         for ( final DataSet dataSet : dataSets )
         {
-            final List<Integer> periodsBetweenDates = getIdentifiers( Period.class,
+            final List<Integer> periodsBetweenDates = ConversionUtils.getIdentifiers( Period.class,
                 periodService.getPeriodsBetweenDates( dataSet.getPeriodType(), period.getStartDate(), period.getEndDate() ) );
 
             final Set<Integer> relevantSources = getRelevantSources( dataSet, children, groupIds );
@@ -231,14 +229,14 @@
 
     @Override
     @Transactional
-    public Collection<DataSetCompletenessResult> getDataSetCompleteness( int periodId,
+    public List<DataSetCompletenessResult> getDataSetCompleteness( int periodId,
         Collection<Integer> organisationUnitIds, int dataSetId, Set<Integer> groupIds )
     {
         final DataSet dataSet = dataSetService.getDataSet( dataSetId );
 
         final Period period = periodService.getPeriod( periodId );
 
-        final List<Integer> periodsBetweenDates = getIdentifiers( Period.class, periodService.getPeriodsBetweenDates( dataSet.getPeriodType(), period.getStartDate(), period.getEndDate() ) );
+        final List<Integer> periodsBetweenDates = ConversionUtils.getIdentifiers( Period.class, periodService.getPeriodsBetweenDates( dataSet.getPeriodType(), period.getStartDate(), period.getEndDate() ) );
 
         final List<DataSetCompletenessResult> results = new ArrayList<>();
 

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java	2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/main/java/org/hisp/dhis/completeness/jdbc/JDBCDataSetCompletenessStore.java	2015-06-16 10:36:25 +0000
@@ -32,6 +32,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import org.amplecode.quick.StatementManager;
 import org.apache.commons.logging.Log;
@@ -158,9 +159,9 @@
     // -------------------------------------------------------------------------
     
     @Override
-    public Collection<DataSet> getDataSetsWithRegistrations( Collection<DataSet> dataSets )
+    public List<DataSet> getDataSetsWithRegistrations( Collection<DataSet> dataSets )
     {
-        Collection<DataSet> selection = new ArrayList<>();
+        List<DataSet> selection = new ArrayList<>();
         
         for ( DataSet dataSet : dataSets )
         {

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java	2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceExportTest.java	2015-06-16 10:36:25 +0000
@@ -41,7 +41,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.List;
 
 import static org.hisp.dhis.commons.util.ConversionUtils.getIdentifiers;
 import static org.junit.Assert.assertEquals;
@@ -92,11 +92,11 @@
 
     private DataSet dataSetA;
 
-    private Collection<DataSet> dataSets;
-
-    private Collection<Period> periods;
-
-    private Collection<OrganisationUnit> units;
+    private List<DataSet> dataSets;
+
+    private List<Period> periods;
+
+    private List<OrganisationUnit> units;
 
     @Override
     public void setUpTest()

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/completeness/DataSetCompletenessServiceTest.java	2015-06-16 10:36:25 +0000
@@ -48,6 +48,7 @@
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 
 import javax.annotation.Resource;
@@ -288,7 +289,7 @@
         registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitC, null, tooLateA, "") );
         registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodB, unitA, null, tooLateB, "") );
 
-        Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
+        List<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
         
         assertNotNull( results );
         assertEquals( 3, results.size() );        
@@ -334,7 +335,7 @@
         registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitA, null, tooLateA, "") );
         registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetC, periodA, unitB, null, onTimeA, "") );
 
-        Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
+        List<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
         
         assertNotNull( results );
         assertEquals( 3, results.size() );        
@@ -373,7 +374,7 @@
         registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitF, null, onTimeB, "") );
         registrationService.saveCompleteDataSetRegistration( new CompleteDataSetRegistration( dataSetA, periodB, unitG, null, tooLateB, "") );
 
-        Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
+        List<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdA, unitIdA, null );
         
         assertNotNull( results );
         assertEquals( 1, results.size() );        
@@ -415,7 +416,7 @@
         groupIds.clear();
         groupIds.add( groupA.getId() );
         
-        Collection<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdC, unitIdA, groupIds );
+        List<DataSetCompletenessResult> results = registrationCompletenessService.getDataSetCompleteness( periodIdC, unitIdA, groupIds );
    
         assertNotNull( results );
         assertEquals( 3, results.size() );

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentServiceTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentServiceTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentServiceTest.java	2015-06-16 10:36:25 +0000
@@ -28,14 +28,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
 import org.hisp.dhis.DhisSpringTest;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import java.util.Collection;
-
-import static org.junit.Assert.*;
-
 /**
  * @author Lars Helge Overland
  * @version $Id$
@@ -93,7 +96,7 @@
         documentService.saveDocument( documentB );
         documentService.saveDocument( documentC );
 
-        Collection<Document> actual = documentService.getAllDocuments();
+        List<Document> actual = documentService.getAllDocuments();
 
         assertEquals( 3, actual.size() );
         assertTrue( actual.contains( documentA ) );

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/document/DocumentStoreTest.java	2015-06-16 10:36:25 +0000
@@ -33,7 +33,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Collection;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -98,7 +98,7 @@
         documentStore.save( documentB );
         documentStore.save( documentC );
         
-        Collection<Document> actual = documentStore.getAll();
+        List<Document> actual = documentStore.getAll();
         
         assertEquals( 3, actual.size() );
         assertTrue( actual.contains( documentA ) );

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportStoreTest.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/report/ReportStoreTest.java	2015-06-16 10:36:25 +0000
@@ -34,7 +34,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
-import java.util.Collection;
+import java.util.List;
 
 import javax.annotation.Resource;
 
@@ -146,7 +146,7 @@
         reportStore.save( reportA );
         reportStore.save( reportB );
         
-        Collection<Report> reports = reportStore.getAll();
+        List<Report> reports = reportStore.getAll();
         
         assertNotNull( reports );
         assertEquals( 2, reports.size() );

=== modified file 'dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java'
--- dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java	2015-03-31 15:22:00 +0000
+++ dhis-2/dhis-services/dhis-service-reporting/src/test/java/org/hisp/dhis/reporttable/ReportTableStoreTest.java	2015-06-16 10:36:25 +0000
@@ -34,7 +34,6 @@
 import static org.junit.Assert.assertTrue;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -275,7 +274,7 @@
         reportTableStore.save( reportTableA );
         reportTableStore.save( reportTableB );
         
-        Collection<ReportTable> reportTables = reportTableStore.getAll();
+        List<ReportTable> reportTables = reportTableStore.getAll();
         
         assertTrue( reportTables.contains( reportTableA ) );
         assertTrue( reportTables.contains( reportTableB ) );

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregatedValueController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregatedValueController.java	2015-03-31 15:22:00 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/AggregatedValueController.java	2015-06-16 10:36:25 +0000
@@ -28,30 +28,30 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletResponse;
+
 import org.hisp.dhis.aggregation.AggregatedDataValue;
 import org.hisp.dhis.aggregation.AggregatedDataValueService;
 import org.hisp.dhis.aggregation.AggregatedIndicatorValue;
-import org.hisp.dhis.webapi.utils.ContextUtils;
+import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.dxf2.common.JacksonUtils;
-import org.hisp.dhis.dataelement.DataElementService;
 import org.hisp.dhis.i18n.I18nManager;
 import org.hisp.dhis.indicator.IndicatorService;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.period.Period;
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.RelativePeriods;
+import org.hisp.dhis.webapi.utils.ContextUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 /**
  * @author Morten Olav Hansen <mortenoh@gmail.com>
  */
@@ -111,9 +111,9 @@
         rp.setLastYear( lastYear );
         rp.setLast5Years( lastFiveYears );
 
-        Collection<Period> periods = periodService.reloadPeriods( rp.getRelativePeriods() );
+        List<Period> periods = periodService.reloadPeriods( rp.getRelativePeriods() );
 
-        Collection<Integer> periodIds = new ArrayList<>();
+        List<Integer> periodIds = new ArrayList<>();
 
         for ( Period period : periods )
         {

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java	2015-02-17 06:00:52 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/DataSetController.java	2015-06-16 10:36:25 +0000
@@ -31,7 +31,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -241,7 +240,7 @@
         {
             i18nService.internationalise( ou );
 
-            Collection<DataValue> dataValues = dataValueService.getDataValues( ou, pe, dataSets.get( 0 ).getDataElements() );
+            List<DataValue> dataValues = dataValueService.getDataValues( ou, pe, dataSets.get( 0 ).getDataElements() );
 
             FormUtils.fillWithDataValues( form, dataValues );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java	2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/mapping/GeoFeatureController.java	2015-06-16 10:36:25 +0000
@@ -56,7 +56,6 @@
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -154,7 +153,7 @@
             return null;
         }
 
-        Collection<OrganisationUnitGroupSet> groupSets = includeGroupSets ? organisationUnitGroupService.getAllOrganisationUnitGroupSets() : null;
+        List<OrganisationUnitGroupSet> groupSets = includeGroupSets ? organisationUnitGroupService.getAllOrganisationUnitGroupSets() : null;
 
         List<GeoFeature> features = new ArrayList<>();
 

=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java	2015-06-15 13:44:20 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/organisationunit/OrganisationUnitLocationController.java	2015-06-16 10:36:25 +0000
@@ -47,7 +47,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -160,7 +159,7 @@
     {
         boolean withinOrgUnit = false;
 
-        Collection<OrganisationUnit> organisationUnits = new ArrayList<>();
+        List<OrganisationUnit> organisationUnits = new ArrayList<>();
         organisationUnits.add( organisationUnitService.getOrganisationUnit( orgUnitUid ) );
         FilterUtils.filter( organisationUnits, new OrganisationUnitPolygonCoveringCoordinateFilter( longitude, latitude ) );
 

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPeriodsAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPeriodsAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetPeriodsAction.java	2015-06-16 10:36:25 +0000
@@ -29,7 +29,6 @@
  */
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -94,7 +93,7 @@
     {
         if ( name == null || name.equals( ALL ) )
         {
-            Collection<PeriodType> periodTypes = periodService.getAllPeriodTypes();
+            List<PeriodType> periodTypes = periodService.getAllPeriodTypes();
 
             periods = new ArrayList<>();
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListAction.java	2015-06-16 10:36:25 +0000
@@ -90,15 +90,15 @@
         {
             this.paging = createPaging( attributeService.getAttributeCountByName( key ) );
 
-            attributes = new ArrayList<>( attributeService.getAttributesBetweenByName( key,
-                paging.getStartPos(), paging.getPageSize() ) );
+            attributes = attributeService.getAttributesBetweenByName( key,
+                paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( attributeService.getAttributeCount() );
 
-            attributes = new ArrayList<>( attributeService.getAttributesBetween( paging.getStartPos(),
-                paging.getPageSize() ) );
+            attributes = attributeService.getAttributesBetween( paging.getStartPos(),
+                paging.getPageSize() );
         }
 
         Collections.sort( attributes, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/attribute/GetAttributeListSortOrderAction.java	2015-06-16 10:36:25 +0000
@@ -73,7 +73,7 @@
     @Override
     public String execute()
     {
-        attributes = new ArrayList<>( attributeService.getAllAttributes() );
+        attributes = attributeService.getAllAttributes();
 
         Collections.sort( attributes, new AttributeSortOrderComparator() );
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/GetConstantListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/GetConstantListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/constant/GetConstantListAction.java	2015-06-16 10:36:25 +0000
@@ -30,7 +30,6 @@
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -95,13 +94,13 @@
         {
             this.paging = createPaging( constantService.getConstantCountByName( key ) );
             
-            constants = new ArrayList<>( constantService.getConstantsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            constants = constantService.getConstantsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( constantService.getConstantCount() );
             
-            constants = new ArrayList<>( constantService.getConstantsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            constants = constantService.getConstantsBetween( paging.getStartPos(), paging.getPageSize() );
         }
         
         Collections.sort( constants, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/GetPeriodTypesAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/GetPeriodTypesAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/databrowser/GetPeriodTypesAction.java	2015-06-16 10:36:25 +0000
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
+import java.util.List;
 
 import org.hisp.dhis.period.PeriodService;
 import org.hisp.dhis.period.PeriodType;
@@ -57,9 +57,9 @@
     // Output
     // -------------------------------------------------------------------------
 
-    private Collection<PeriodType> periodTypes;
+    private List<PeriodType> periodTypes;
 
-    public Collection<PeriodType> getPeriodTypes()
+    public List<PeriodType> getPeriodTypes()
     {
         return periodTypes;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/GetLocaleListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/GetLocaleListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/locale/GetLocaleListAction.java	2015-06-16 10:36:25 +0000
@@ -109,8 +109,8 @@
 
             this.paging = createPaging( total );
 
-            i18nlocales = new ArrayList<>( localeService.getI18nLocalesBetweenLikeName( key, paging.getStartPos(),
-                paging.getPageSize() ) );
+            i18nlocales = localeService.getI18nLocalesBetweenLikeName( key, paging.getStartPos(),
+                paging.getPageSize() );
         }
         else
         {
@@ -118,8 +118,8 @@
 
             this.paging = createPaging( total );
 
-            i18nlocales = new ArrayList<>( localeService.getI18nLocalesBetween( paging.getStartPos(),
-                paging.getPageSize() ) );
+            i18nlocales = localeService.getI18nLocalesBetween( paging.getStartPos(),
+                paging.getPageSize() );
         }
 
         Collections.sort( i18nlocales, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionListAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionListAction.java	2015-06-16 10:36:25 +0000
@@ -28,7 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import java.util.Collection;
+import java.util.List;
 
 import org.hisp.dhis.option.Option;
 import org.hisp.dhis.option.OptionService;
@@ -89,9 +89,9 @@
         return optionSet;
     }
 
-    private Collection<Option> options;
+    private List<Option> options;
 
-    public Collection<Option> getOptions()
+    public List<Option> getOptions()
     {
         return options;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/option/GetOptionSetListAction.java	2015-06-16 10:36:25 +0000
@@ -93,14 +93,14 @@
         {
             this.paging = createPaging( optionService.getOptionSetsCountByName( key ) );
 
-            optionSets = new ArrayList<>( optionService.getOptionSetsBetweenByName( key, paging.getStartPos(),
-                paging.getPageSize() ) );
+            optionSets = optionService.getOptionSetsBetweenByName( key, paging.getStartPos(),
+                paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( optionService.getOptionSetCount() );
 
-            optionSets = new ArrayList<>( optionService.getOptionSetsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            optionSets = optionService.getOptionSetsBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         Collections.sort( optionSets, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/sqlview/GetSqlViewListAction.java	2015-06-16 10:36:25 +0000
@@ -30,7 +30,6 @@
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -90,16 +89,15 @@
         if ( isNotBlank( key ) )
         {
             this.paging = createPaging( sqlViewService.getSqlViewCountByName( key ) );
-            sqlViewObjectList = new ArrayList<>(
-                sqlViewService.getSqlViewsBetweenByName( key, paging.getStartPos(),
-                    paging.getPageSize() ) );
+            sqlViewObjectList = sqlViewService.getSqlViewsBetweenByName( key, paging.getStartPos(),
+                    paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( sqlViewService.getSqlViewCount() );
             
-            sqlViewObjectList = new ArrayList<>( sqlViewService.getSqlViewsBetween(
-                paging.getStartPos(), paging.getPageSize() ) );
+            sqlViewObjectList = sqlViewService.getSqlViewsBetween(
+                paging.getStartPos(), paging.getPageSize() );
         }
 
         Collections.sort( sqlViewObjectList, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java	2015-06-16 08:40:38 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetCategoryOptionComboListAction.java	2015-06-16 10:36:25 +0000
@@ -28,6 +28,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
@@ -80,7 +81,8 @@
         defaultCategoryOptionCombo = categoryService.getDefaultDataElementCategoryOptionCombo();
 
         this.paging = createPaging( categoryService.getOptionComboCount() );
-        optionCombos = categoryService.getOptionCombosBetween( paging.getStartPos(), paging.getPageSize() );
+        optionCombos = categoryService.getOptionCombosBetween( paging.getStartPos(),
+            paging.getPageSize() );
 
         return SUCCESS;
     }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryListAction.java	2015-06-16 10:36:25 +0000
@@ -100,13 +100,13 @@
         {
             this.paging = createPaging( dataElementCategoryService.getDataElementCategoryCountByName( key ) );
             
-            dataElementCategories = new ArrayList<>( dataElementCategoryService.getDataElementCategoriesBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            dataElementCategories = dataElementCategoryService.getDataElementCategoriesBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( dataElementCategoryService.getDataElementCategoryCount() );
             
-            dataElementCategories = new ArrayList<>( dataElementCategoryService.getDataElementCategoriesBetween( paging.getStartPos(), paging.getPageSize() ) );
+            dataElementCategories = dataElementCategoryService.getDataElementCategoriesBetween( paging.getStartPos(), paging.getPageSize() );
         }
         
         Collections.sort( dataElementCategories, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/category/GetDataElementCategoryOptionListAction.java	2015-06-16 10:36:25 +0000
@@ -98,15 +98,13 @@
         {
             this.paging = createPaging( dataElementCategoryService.getDataElementCategoryOptionCountByName( key ) );
 
-            dataElementCategoryOptions = new ArrayList<>(
-                dataElementCategoryService.getDataElementCategoryOptionsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            dataElementCategoryOptions = dataElementCategoryService.getDataElementCategoryOptionsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( dataElementCategoryService.getDataElementCategoryOptionCount() );
 
-            dataElementCategoryOptions = new ArrayList<>(
-                dataElementCategoryService.getDataElementCategoryOptionsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            dataElementCategoryOptions = dataElementCategoryService.getDataElementCategoryOptionsBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/categoryoptiongroup/GetCategoryOptionGroupListAction.java	2015-06-16 10:36:25 +0000
@@ -91,7 +91,7 @@
         {
             this.paging = createPaging( dataElementCategoryService.getCategoryOptionGroupCountByName( key ) );
 
-            Collection<CategoryOptionGroup> groups = dataElementCategoryService.getCategoryOptionGroupsBetweenByName(
+            List<CategoryOptionGroup> groups = dataElementCategoryService.getCategoryOptionGroupsBetweenByName(
                 paging.getStartPos(), paging.getPageSize(), key );
 
             categoryOptionGroups.addAll( groups );
@@ -100,7 +100,7 @@
         {
             this.paging = createPaging( dataElementCategoryService.getCategoryOptionGroupCount() );
 
-            Collection<CategoryOptionGroup> groups = dataElementCategoryService.getCategoryOptionGroupsBetween(
+            List<CategoryOptionGroup> groups = dataElementCategoryService.getCategoryOptionGroupsBetween(
                 paging.getStartPos(), paging.getPageSize() );
 
             categoryOptionGroups.addAll( groups );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetAssignedGroupsByDataElementAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetAssignedGroupsByDataElementAction.java	2015-03-10 11:58:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/dataelementgroup/GetAssignedGroupsByDataElementAction.java	2015-06-16 10:36:25 +0000
@@ -87,8 +87,7 @@
         {
             DataElement dataElement = dataElementService.getDataElement( dataElementId );
 
-            dataElementGroups = new ArrayList<>( dataElementService
-                .getGroupsContainingDataElement( dataElement ) );
+            dataElementGroups = dataElementService.getGroupsContainingDataElement( dataElement );
 
             Collections.sort( dataElementGroups, IdentifiableObjectNameComparator.INSTANCE );
         }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/java/org/hisp/dhis/dd/action/indicatortype/GetIndicatorTypeListAction.java	2015-06-16 10:36:25 +0000
@@ -115,20 +115,19 @@
         {
             this.paging = createPaging( indicatorService.getIndicatorTypeCountByName( key ) );
 
-            indicatorTypes = new ArrayList<>( indicatorService.getIndicatorTypesBetweenByName( key,
-                paging.getStartPos(), paging.getPageSize() ) );
+            indicatorTypes = indicatorService.getIndicatorTypesBetweenByName( key,
+                paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( indicatorService.getIndicatorTypeCount() );
 
-            indicatorTypes = new ArrayList<>( indicatorService.getIndicatorTypesBetween(
-                paging.getStartPos(), paging.getPageSize() ) );
+            indicatorTypes = indicatorService.getIndicatorTypesBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
-        groupSets = new ArrayList<>( indicatorService.getCompulsoryIndicatorGroupSetsWithMembers() );
+        groupSets = indicatorService.getCompulsoryIndicatorGroupSetsWithMembers();
 
-        attributes = new ArrayList<>( attributeService.getIndicatorAttributes() );
+        attributes = attributeService.getIndicatorAttributes();
 
         Collections.sort( indicatorTypes, IdentifiableObjectNameComparator.INSTANCE );
         Collections.sort( attributes, AttributeSortOrderComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/DataSetListAction.java	2015-06-16 10:36:25 +0000
@@ -96,15 +96,13 @@
         {
             this.paging = createPaging( dataSetService.getDataSetCountByName( key ) );
 
-            dataSets = new ArrayList<>( dataSetService.getDataSetsBetweenByName( key, paging.getStartPos(),
-                paging.getPageSize() ) );
+            dataSets = dataSetService.getDataSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( dataSetService.getDataSetCount() );
 
-            dataSets = new ArrayList<>( dataSetService.getDataSetsBetween( paging.getStartPos(), paging
-                .getPageSize() ) );
+            dataSets = dataSetService.getDataSetsBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         Collections.sort( dataSets, new IdentifiableObjectNameComparator() );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/java/org/hisp/dhis/dataset/action/compulsory/GetCompulsoryDataElementsAction.java	2015-06-16 10:36:25 +0000
@@ -110,7 +110,7 @@
 
         selectedOperands = new ArrayList<>( dataSet.getCompulsoryDataElementOperands() );
 
-        availableOperands = new ArrayList<>( dataElementCategoryService.getOperands( dataSet.getDataElements() ) );
+        availableOperands = dataElementCategoryService.getOperands( dataSet.getDataElements() );
         
         Iterator<DataElementOperand> availableIter = availableOperands.iterator();
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroup/GetOrganisationUnitGroupListAction.java	2015-06-16 10:36:25 +0000
@@ -92,13 +92,13 @@
         {
             this.paging = createPaging( organisationUnitGroupService.getOrganisationUnitGroupCountByName( key ) );
             
-            organisationUnitGroups = new ArrayList<>( organisationUnitGroupService.getOrganisationUnitGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            organisationUnitGroups = organisationUnitGroupService.getOrganisationUnitGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( organisationUnitGroupService.getOrganisationUnitGroupCount() );
             
-            organisationUnitGroups = new ArrayList<>( organisationUnitGroupService.getOrganisationUnitGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            organisationUnitGroups = organisationUnitGroupService.getOrganisationUnitGroupsBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         Collections.sort( organisationUnitGroups, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/java/org/hisp/dhis/oum/action/organisationunitgroupset/GetGroupSetListAction.java	2015-06-16 10:36:25 +0000
@@ -92,13 +92,13 @@
         {
             this.paging = createPaging( organisationUnitGroupService.getOrganisationUnitGroupSetCountByName( key ) );
             
-            organisationUnitGroupSets = new ArrayList<>( organisationUnitGroupService.getOrganisationUnitGroupSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            organisationUnitGroupSets = organisationUnitGroupService.getOrganisationUnitGroupSetsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( organisationUnitGroupService.getOrganisationUnitGroupSetCount() );
             
-            organisationUnitGroupSets = new ArrayList<>( organisationUnitGroupService.getOrganisationUnitGroupSetsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            organisationUnitGroupSets = organisationUnitGroupService.getOrganisationUnitGroupSetsBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         Collections.sort( organisationUnitGroupSets, IdentifiableObjectNameComparator.INSTANCE );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/GetRoleListAction.java	2015-06-16 10:36:25 +0000
@@ -30,7 +30,6 @@
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.hisp.dhis.paging.ActionPagingSupport;
@@ -90,13 +89,13 @@
         {
             this.paging = createPaging( userService.getUserRoleCountByName( key ) );
             
-            userAuthorityGroups = new ArrayList<>( userService.getUserRolesBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            userAuthorityGroups = userService.getUserRolesBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( userService.getUserRoleCount() );
             
-            userAuthorityGroups = new ArrayList<>( userService.getUserRolesBetween( paging.getStartPos(), paging.getPageSize() ) );
+            userAuthorityGroups = userService.getUserRolesBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         return SUCCESS;

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/GetUserGroupListAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/GetUserGroupListAction.java	2015-02-19 09:18:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/java/org/hisp/dhis/user/action/usergroup/GetUserGroupListAction.java	2015-06-16 10:36:25 +0000
@@ -30,7 +30,6 @@
 
 import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,13 +110,13 @@
         {
             this.paging = createPaging( userGroupService.getUserGroupCountByName( key ) );
             
-            userGroupList = new ArrayList<>( userGroupService.getUserGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() ) );
+            userGroupList = userGroupService.getUserGroupsBetweenByName( key, paging.getStartPos(), paging.getPageSize() );
         }
         else
         {
             this.paging = createPaging( userGroupService.getUserGroupCount() );
             
-            userGroupList = new ArrayList<>( userGroupService.getUserGroupsBetween( paging.getStartPos(), paging.getPageSize() ) );
+            userGroupList = userGroupService.getUserGroupsBetween( paging.getStartPos(), paging.getPageSize() );
         }
 
         currentUserUid = currentUserService.getCurrentUser().getUid();