dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 19494
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-06-22 22:07:56 +0200
message:
  Resource tables, added extra check for uniqueness among daily periods to avoid exceptions
added:
  dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/collection/
  dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/collection/UniqueArrayListTest.java
modified:
  dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java
  dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/UniqueArrayList.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-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java'
--- dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2015-04-16 21:24:00 +0000
+++ dhis-2/dhis-services/dhis-service-administration/src/main/java/org/hisp/dhis/resourcetable/DefaultResourceTableService.java	2015-06-22 20:07:56 +0000
@@ -50,6 +50,7 @@
 import org.hisp.dhis.common.IdentifiableObjectManager;
 import org.hisp.dhis.common.IdentifiableObjectUtils;
 import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator;
+import org.hisp.dhis.commons.collection.UniqueArrayList;
 import org.hisp.dhis.dataapproval.DataApprovalLevelService;
 import org.hisp.dhis.dataelement.CategoryOptionGroup;
 import org.hisp.dhis.dataelement.CategoryOptionGroupSet;
@@ -424,7 +425,7 @@
         resourceTableStore.createDatePeriodStructure();
 
         // ---------------------------------------------------------------------
-        // Populate table
+        // Populate table, uniqueness check as some calendars produce duplicates
         // ---------------------------------------------------------------------
 
         List<PeriodType> periodTypes = PeriodType.getAvailablePeriodTypes();
@@ -434,7 +435,7 @@
         Date startDate = new Cal( 1975, 1, 1, true ).time(); //TODO
         Date endDate = new Cal( 2025, 1, 1, true ).time();
 
-        List<Period> days = new DailyPeriodType().generatePeriods( startDate, endDate );
+        List<Period> days = new UniqueArrayList<>( new DailyPeriodType().generatePeriods( startDate, endDate ) );
 
         Calendar calendar = PeriodType.getCalendar();
 

=== modified file 'dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/UniqueArrayList.java'
--- dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/UniqueArrayList.java	2015-06-16 17:57:23 +0000
+++ dhis-2/dhis-support/dhis-support-commons/src/main/java/org/hisp/dhis/commons/collection/UniqueArrayList.java	2015-06-22 20:07:56 +0000
@@ -39,7 +39,18 @@
  */
 public class UniqueArrayList<E>
     extends ArrayList<E>
-{    
+{
+    public UniqueArrayList()
+    {
+        super();
+    }
+    
+    public UniqueArrayList( Collection<? extends E> c )
+    {
+        super();
+        addAll( c );
+    }
+    
     @Override
     public boolean add( E e )
     {

=== added directory 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/collection'
=== added file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/collection/UniqueArrayListTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/collection/UniqueArrayListTest.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/collection/UniqueArrayListTest.java	2015-06-22 20:07:56 +0000
@@ -0,0 +1,117 @@
+package org.hisp.dhis.system.collection;
+
+/*
+ * Copyright (c) 2004-2015, University of Oslo
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ * Neither the name of the HISP project nor the names of its contributors may
+ * be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hisp.dhis.commons.collection.UniqueArrayList;
+import org.hisp.dhis.period.MonthlyPeriodType;
+import org.hisp.dhis.period.Period;
+import org.hisp.dhis.period.PeriodType;
+import org.joda.time.DateTime;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+* @author Lars Helge Overland
+*/
+public class UniqueArrayListTest
+{
+    @Test
+    public void testAdd()
+    {
+        List<Period> list = new UniqueArrayList<>();
+        
+        PeriodType periodType = new MonthlyPeriodType();
+        Period peA = periodType.createPeriod( new DateTime( 2000, 1, 1, 0, 0 ).toDate() );
+        Period peB = periodType.createPeriod( new DateTime( 2000, 1, 1, 0, 0 ).toDate() ); // Duplicate
+        Period peC = periodType.createPeriod( new DateTime( 2000, 2, 1, 0, 0 ).toDate() );
+        
+        list.add( peA );
+        list.add( peB );
+        list.add( peC );
+        
+        assertEquals( 2, list.size() );
+        assertTrue( list.contains( peA ) );
+        assertTrue( list.contains( peB ) );
+        assertTrue( list.contains( peC ) );
+    }
+
+    @Test
+    public void testAddAll()
+    {
+        List<Period> list = new ArrayList<>();
+        
+        PeriodType periodType = new MonthlyPeriodType();
+        Period peA = periodType.createPeriod( new DateTime( 2000, 1, 1, 0, 0 ).toDate() );
+        Period peB = periodType.createPeriod( new DateTime( 2000, 1, 1, 0, 0 ).toDate() ); // Duplicate
+        Period peC = periodType.createPeriod( new DateTime( 2000, 2, 1, 0, 0 ).toDate() );
+        
+        list.add( peA );
+        list.add( peB );
+        list.add( peC );
+        
+        assertEquals( 3, list.size() );
+        
+        List<Period> uniqueList = new UniqueArrayList<>();
+        uniqueList.addAll( list );
+        
+        assertEquals( 2, uniqueList.size() );
+        assertTrue( uniqueList.contains( peA ) );
+        assertTrue( uniqueList.contains( peB ) );
+        assertTrue( uniqueList.contains( peC ) );
+    }
+    
+    @Test
+    public void testCollectionConstructor()
+    {
+        List<Period> list = new ArrayList<>();
+        
+        PeriodType periodType = new MonthlyPeriodType();
+        Period peA = periodType.createPeriod( new DateTime( 2000, 1, 1, 0, 0 ).toDate() );
+        Period peB = periodType.createPeriod( new DateTime( 2000, 1, 1, 0, 0 ).toDate() ); // Duplicate
+        Period peC = periodType.createPeriod( new DateTime( 2000, 2, 1, 0, 0 ).toDate() );
+        
+        list.add( peA );
+        list.add( peB );
+        list.add( peC );
+        
+        assertEquals( 3, list.size() );
+        
+        List<Period> uniqueList = new UniqueArrayList<>( list );
+        
+        assertEquals( 2, uniqueList.size() );
+        assertTrue( uniqueList.contains( peA ) );
+        assertTrue( uniqueList.contains( peB ) );
+        assertTrue( uniqueList.contains( peC ) );
+    }
+}