Merge pull request #588 from peterlacko/remove-default-sorting

Remove default sorting from ResultSpec in VisualizationConverter

Author: jimirocks

src/main/java/com/gooddata/md/visualization/VisualizationConverter.java

@@ -86,7 +86,8 @@ static List<SortItem> getSorting(final VisualizationObject visualizationObject)
                  return sorts;
              }
         } catch (Exception ignored) {}
-        return generateDefaultSorting(visualizationObject);
+
+        return null;
     }
 
     static List<SortItem> parseSorting(final String properties) throws Exception {
@@ -96,21 +97,6 @@ static List<SortItem> parseSorting(final String properties) throws Exception {
         return MAPPER.convertValue(nodeSortItems, mapType);
     }
 
-    private static List<SortItem> generateDefaultSorting(final VisualizationObject visualizationObject) {
-        List<VisualizationAttribute> attributes = visualizationObject.getAttributes();
-        if(!attributes.isEmpty()) {
-            return Collections.singletonList(new AttributeSortItem(Direction.ASC, attributes.get(0).getLocalIdentifier()));
-        }
-
-        List<Measure> measures = visualizationObject.getMeasures();
-        if(!measures.isEmpty()) {
-            MeasureLocatorItem locator = new MeasureLocatorItem(measures.get(0).getLocalIdentifier());
-            return Collections.singletonList(new MeasureSortItem(Direction.DESC, Collections.singletonList(locator)));
-        }
-
-        return null;
-    }
-
     private static List<Dimension> getDimensions(final VisualizationObject visualizationObject,
                                                  final VisualizationType visualizationType) {
         switch (visualizationType) {

src/test/groovy/com/gooddata/md/visualization/VisualizationObjectConverterTest.groovy

@@ -93,11 +93,11 @@ class VisualizationObjectConverterTest extends Specification {
         name         | resource                   | expected
         "measures"   | MULTIPLE_MEASURE_BUCKETS   | new ResultSpec(
                 [new Dimension([]), new Dimension("measureGroup")],
-                [new MeasureSortItem("desc", [new MeasureLocatorItem("measure1")])]
+                null
         )
         "attributes" | MULTIPLE_ATTRIBUTE_BUCKETS | new ResultSpec(
                 [new Dimension(["attribute1", "attribute2", "attribute"], null)],
-                [new AttributeSortItem("asc", "attribute1")]
+                null
         )
     }
 
@@ -114,15 +114,15 @@ class VisualizationObjectConverterTest extends Specification {
         type   | resource             | expected
         "pie"  | STACKED_COLUMN_CHART | new ResultSpec(
                 [new Dimension("measureGroup"), new Dimension("1")],
-                [new AttributeSortItem("asc", "1")]
+                null
         )
         "bar"  | STACKED_COLUMN_CHART | new ResultSpec(
                 [new Dimension("2"), new Dimension(["1", "measureGroup"], null)],
-                [new AttributeSortItem("asc", "1")]
+                null
         )
         "line" | LINE_CHART           | new ResultSpec(
                 [new Dimension("measureGroup"), new Dimension("1")],
-                [new AttributeSortItem("asc", "1")]
+                null
         )
     }