dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9793
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-02-12 18:05:31 +0200
message:
  Analytics, fixed issue with query param ordering
added:
  dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ListUtilsTest.java
modified:
  dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java
  dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.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-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2013-02-07 13:05:29 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java	2013-02-12 16:05:31 +0000
@@ -46,6 +46,7 @@
 import org.hisp.dhis.period.PeriodType;
 import org.hisp.dhis.system.util.CollectionUtils;
 import org.hisp.dhis.system.util.ListMap;
+import org.hisp.dhis.system.util.ListUtils;
 import org.hisp.dhis.system.util.MapMap;
 import org.hisp.dhis.system.util.MathUtils;
 
@@ -379,11 +380,13 @@
         {
             List<String> keys = new ArrayList<String>( Arrays.asList( key.split( DIMENSION_SEP ) ) );
             
-            String de = keys.get( getDataElementDimensionIndex() );
-            String coc = keys.get( getCategoryOptionComboDimensionIndex() );
-            
-            keys.remove( getDataElementDimensionIndex() );
-            keys.remove( getCategoryOptionComboDimensionIndex() - 1 );
+            int deInx = getDataElementDimensionIndex();
+            int cocInx = getCategoryOptionComboDimensionIndex();
+            
+            String de = keys.get( deInx );
+            String coc = keys.get( cocInx );
+            
+            ListUtils.removeAll( keys, deInx, cocInx );
             
             String permKey = StringUtils.join( keys, DIMENSION_SEP );
             

=== modified file 'dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.java'
--- dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.java	2012-01-25 17:11:43 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/util/ListUtils.java	2013-02-12 16:05:31 +0000
@@ -28,6 +28,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -41,6 +42,28 @@
 public class ListUtils
 {
     /**
+     * Removes from the given list the elements at the given indexes.
+     * 
+     * @param list the list to remove elements from.
+     * @param indexes the indexes for the elements to remove.
+     */
+    public static <T> void removeAll( List<T> list, Integer... indexes )
+    {
+        if ( list == null || indexes == null )
+        {
+            return;
+        }
+        
+        List<Integer> inx = new ArrayList<Integer>( Arrays.asList( indexes ) );
+        Collections.sort( inx, Collections.reverseOrder() );
+        
+        for ( Integer index : inx )
+        {            
+            list.remove( (int) index );
+        }
+    }
+    
+    /**
      * Checks whether the given list contains duplicates. List entries are compared
      * using the given comparator.
      * 

=== added file 'dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ListUtilsTest.java'
--- dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ListUtilsTest.java	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-support/dhis-support-system/src/test/java/org/hisp/dhis/system/util/ListUtilsTest.java	2013-02-12 16:05:31 +0000
@@ -0,0 +1,60 @@
+package org.hisp.dhis.system.util;
+
+/*
+ * Copyright (c) 2004-2012, 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.Arrays;
+import java.util.List;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author Lars Helge Overland
+ */
+public class ListUtilsTest
+{
+    @Test
+    public void testRemoveAll()
+    {
+        List<String> list = new ArrayList<String>( Arrays.asList( "a", "b", "c", "d", "e", "f", "g", "h" ) );
+        
+        Integer[] indexes = { 0, 2, 5, 7 };
+
+        assertEquals( 8, list.size() );
+        
+        ListUtils.removeAll( list, indexes );
+        
+        assertEquals( 4, list.size() );
+        assertTrue( list.contains( "b" ) );
+        assertTrue( list.contains( "d" ) );
+        assertTrue( list.contains( "e" ) );
+        assertTrue( list.contains( "g" ) );
+    }
+}