Merge pull request #585 from peterlacko/voluntary-measure-filters

Make measure filters in visualisation object voluntary for conversion

Author: liry

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

@@ -214,6 +214,7 @@ private static List<CompatibilityFilter> convertFilters(final List<FilterItem> f
         if (filters == null) {
             return new ArrayList<>();
         }
+
         List<FilterItem> validFilters = removeIrrelevantFilters(filters);
         return getCompatibilityFilters(validFilters);
     }
@@ -249,7 +250,14 @@ private static MeasureItem getAfmMeasure(final Measure measure) {
     private static MeasureItem convertMeasureFilters(final MeasureItem measure) {
         if (measure.getDefinition() instanceof SimpleMeasureDefinition) {
             List<FilterItem> filters = ((SimpleMeasureDefinition) measure.getDefinition()).getFilters();
-            List<FilterItem> validFilters = removeIrrelevantFilters(filters);
+
+            List<FilterItem> validFilters;
+            if (filters == null) {
+                validFilters = new ArrayList<>();
+            } else {
+                validFilters = removeIrrelevantFilters(filters);
+            }
+
             ((SimpleMeasureDefinition) measure.getDefinition()).setFilters(validFilters);
         }
 

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

@@ -48,14 +48,18 @@ class VisualizationObjectConverterTest extends Specification {
                         new PositiveAttributeFilter(new UriObjQualifier("/uri/to/displayForm/3"), ["ab", "cd"]),
                         new AbsoluteDateFilter(new UriObjQualifier("/uri/to/dataSet/1"), new LocalDate("2000-08-30"), new LocalDate("2017-08-07"))
                 ],
-                [new MeasureItem(new VOSimpleMeasureDefinition(new UriObjQualifier("/uri/to/measure/1"), "sum", false,
-                        [
-                                new PositiveAttributeFilter(new UriObjQualifier("/uri/to/displayForm/3"), []),
-                                new NegativeAttributeFilter(new UriObjQualifier("/uri/to/displayForm/3"), ["ab", "cd"]),
-                                new RelativeDateFilter(new UriObjQualifier("/uri/to/dataSet/2"), "month", 0, -11)
-                        ]
-                ),
-                        "measure1", "Measure 1 alias", null)],
+                [
+                        new MeasureItem(new VOSimpleMeasureDefinition(new UriObjQualifier("/uri/to/measure/0"), null, null, []),
+                                "measure0", "Measure 0 alias", null),
+                        new MeasureItem(new VOSimpleMeasureDefinition(new UriObjQualifier("/uri/to/measure/1"), "sum", false,
+                                [
+                                        new PositiveAttributeFilter(new UriObjQualifier("/uri/to/displayForm/3"), []),
+                                        new NegativeAttributeFilter(new UriObjQualifier("/uri/to/displayForm/3"), ["ab", "cd"]),
+                                        new RelativeDateFilter(new UriObjQualifier("/uri/to/dataSet/2"), "month", 0, -11)
+                                ]
+                        ),
+                                "measure1", "Measure 1 alias", null)
+                ],
                 null
         )
         VisualizationObject visualizationObject = readObjectFromResource("/$COMPLEX_VISUALIZATION", VisualizationObject)

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

@@ -59,6 +59,13 @@ class VisualizationObjectTest extends Specification {
                         [
                                 new Bucket("bucket1", [attribute1]),
                                 new Bucket("bucket2", [
+                                        new Measure(
+                                                new VOSimpleMeasureDefinition(new UriObjQualifier("/uri/to/measure/0"), null, null, null),
+                                                "measure0",
+                                                "Measure 0 alias",
+                                                null,
+                                                null
+                                        ),
                                         new Measure(
                                                 measureDefinition,
                                                 "measure1",

src/test/resources/md/visualization/complexVisualizationObject.json

@@ -25,6 +25,18 @@
           "localIdentifier": "bucket2",
           "items": [
             {
+              "measure": {
+                "localIdentifier": "measure0",
+                "alias": "Measure 0 alias",
+                "definition": {
+                  "measureDefinition": {
+                    "item": {
+                      "uri": "/uri/to/measure/0"
+                    }
+                  }
+                }
+              }
+            }, {
               "measure": {
                 "localIdentifier": "measure1",
                 "title": "Measure 1",

src/test/resources/md/visualization/multipleMeasureBucketsVisualization.json

@@ -22,8 +22,7 @@
                       "uri": "/uri/to/measure/1"
                     },
                     "aggregation": "sum",
-                    "computeRatio": false,
-                    "filters": []
+                    "computeRatio": false
                   }
                 }
               }