Merge pull request gooddata#564 from gooddata/jmi-fix

liry · web-flow · commit 6ae6445fa4b4 · 2017-11-23T13:16:14.000+01:00
improve ResultHeader* constructors
diff --git a/src/main/java/com/gooddata/executeafm/result/ResultHeaderItem.java b/src/main/java/com/gooddata/executeafm/result/ResultHeaderItem.java
@@ -9,7 +9,7 @@
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
 import com.gooddata.util.GoodDataToStringBuilder;
 
-import static com.gooddata.util.Validate.notEmpty;
+import static com.gooddata.util.Validate.notNull;
 
 /**
  * Represent header items available in {@link ExecutionResult}
@@ -25,7 +25,7 @@ public abstract class ResultHeaderItem {
     private final String name;
 
     protected ResultHeaderItem(final String name) {
-        this.name = notEmpty(name, "name");
+        this.name = notNull(name, "name");
     }
 
     /**
diff --git a/src/main/java/com/gooddata/executeafm/result/ResultTotalHeaderItem.java b/src/main/java/com/gooddata/executeafm/result/ResultTotalHeaderItem.java
@@ -24,6 +24,22 @@ public class ResultTotalHeaderItem extends ResultHeaderItem {
 
     private final String type;
 
+    /**
+     * Creates new instance of given total type, type is used for the name as well
+     * @param type total type
+     */
+    public ResultTotalHeaderItem(final String type) {
+        this(type, type);
+    }
+
+    /**
+     * Creates new instance of given total type, type is used for the name as well
+     * @param type total type
+     */
+    public ResultTotalHeaderItem(final Total type) {
+        this(notNull(type, "type").toString());
+    }
+
     /**
      * Creates new instance of given header name and total type
      * @param name header name
diff --git a/src/test/groovy/com/gooddata/executeafm/result/ResultHeaderItemTest.groovy b/src/test/groovy/com/gooddata/executeafm/result/ResultHeaderItemTest.groovy
@@ -25,4 +25,17 @@ class ResultHeaderItemTest extends Specification {
         typeClass << [AttributeHeaderItem, ResultMeasureHeaderItem, ResultTotalHeaderItem]
         type = typeClass.simpleName.uncapitalize()
     }
+
+    def "should allow empty name"() {
+        expect:
+        new ResultHeaderItem('') {}.name == ''
+    }
+
+    def "should not allow null name"() {
+        when:
+        new ResultHeaderItem(null) {}
+
+        then:
+        thrown(IllegalArgumentException)
+    }
 }
diff --git a/src/test/groovy/com/gooddata/executeafm/result/ResultTotalHeaderItemTest.groovy b/src/test/groovy/com/gooddata/executeafm/result/ResultTotalHeaderItemTest.groovy
@@ -32,4 +32,16 @@ class ResultTotalHeaderItemTest extends Specification {
         item.name == 'Some total'
         item.type == 'avg'
     }
+
+    def "should create from type only"() {
+        expect:
+        with(new ResultTotalHeaderItem('avg')) {
+            name == 'avg'
+            type == 'avg'
+        }
+        with(new ResultTotalHeaderItem(Total.SUM)) {
+            name == 'sum'
+            type == 'sum'
+        }
+    }
 }
