MONDRIAN-642 - Enhance hideMemberIf="IfBlankName" to consider whitesp…

…ace as blank

[git-p4: depot-paths = "//open/mondrian/": change = 13163]

src/main/mondrian/olap/Mondrian.xml

@@ -636,7 +636,7 @@ Revision is $Id$
                 <p>Allowable values are:
                 <code>Never</code> (a member always appears; the default);
                 <code>IfBlankName</code> (a member doesn't appear if its name
-                is null or empty); and
+                is null, empty or all whitespace); and
                 <code>IfParentsName</code> (a member appears unless its name
                 matches the parent's.</p>
             </Doc>

src/main/mondrian/olap/Util.java

@@ -2574,6 +2574,35 @@ public static void checkCJResultLimit(long resultSize) {
                 resultSize, Integer.MAX_VALUE);
         }
     }
+
+    /**
+     * <p>Copied from commons-lang
+     * Checks if a String is whitespace, empty ("") or null.</p>
+     *
+     * <pre>
+     * StringUtils.isBlank(null) = true
+     * StringUtils.isBlank("") = true
+     * StringUtils.isBlank(" ") = true
+     * StringUtils.isBlank("bob") = false
+     * StringUtils.isBlank(" bob ") = false
+     * </pre>
+     *
+     * @param str the String to check, may be null
+     * @return <code>true</code> if the String is null, empty or whitespace
+     * @since 2.0
+     */
+    public static boolean isBlank(String str) {
+        int strLen;
+        if (str == null || (strLen = str.length()) == 0) {
+            return true;
+        }
+        for (int i = 0; i < strLen; i++) {
+            if ((Character.isWhitespace(str.charAt(i)) == false)) {
+                return false;
+            }
+        }
+        return true;
+    }
 }
 
 // End Util.java

src/main/mondrian/rolap/RolapMember.java

@@ -782,7 +782,8 @@ public boolean isHidden() {
             // If the key value in the database is null, then we use
             // a special key value whose toString() is "null".
             final String name = getName();
-            return name.equals(RolapUtil.mdxNullLiteral()) || name.equals("");
+            return name.equals(RolapUtil.mdxNullLiteral())
+                || Util.isBlank(name);
         }
 
         case IfParentsName:

testsrc/main/mondrian/test/RaggedHierarchyTest.java

@@ -9,6 +9,8 @@
 */
 package mondrian.test;
 
+import mondrian.spi.Dialect;
+
 /**
  * <code>RaggedHierarchyTest</code> tests ragged hierarchies.
  * <p>
@@ -318,6 +320,39 @@ public void dont_testMeasures() {
             + "Row #30: 35,257\n"
             + "Row #31: 35,257\n");
     }
+
+    public void testHideIfBlankHidesWhitespace() {
+        if (TestContext.instance().getDialect().getDatabaseProduct()
+            == Dialect.DatabaseProduct.ORACLE)
+        {
+            TestContext testContext = TestContext.createSubstitutingCube(
+                "Sales",
+                "<Dimension name=\"Gender4\" foreignKey=\"customer_id\">\n"
+                    + "    <Hierarchy hasAll=\"true\" allMemberName=\"All Gender\" primaryKey=\"customer_id\">\n"
+                    + "      <Table name=\"customer\"/>\n"
+                    + "      <Level name=\"Gender\" column=\"gender\" uniqueMembers=\"true\" hideMemberIf=\"IfBlankName\">\n"
+                    + "         <NameExpression> "
+                    + " <SQL dialect='generic'> "
+                    +           "case \"gender\" "
+                    +           "when 'F' then ' ' "
+                    +           "when 'M' then 'M' "
+                    + " end "
+                    + "</SQL> "
+                    + "</NameExpression>  "
+                    + "      </Level>"
+                    + "    </Hierarchy>\n"
+                    + "  </Dimension>");
+            testContext.assertQueryReturns(
+                " select {[Gender4].[Gender].members} "
+                    + "on COLUMNS "
+                    + "from sales",
+                "Axis #0:\n"
+                    + "{}\n"
+                    + "Axis #1:\n"
+                    + "{[Gender4].[All Gender].[M]}\n"
+                    + "Row #0: 135,215\n");
+        }
+    }
 }
 
 // End RaggedHierarchyTest.java