From a9f7907f9d0109bdbf2ebbe35f8e5e9aafe8ea37 Mon Sep 17 00:00:00 2001
From: Briana Augenreich <baugenreich@hubspot.com>
Date: Mon, 14 Feb 2022 10:33:46 -0500
Subject: [PATCH] HubSpot Backport: HBASE-26745 Include Balancer Cost metrics
 in jmx endpoint

---
 .../main/java/org/apache/hadoop/hbase/util/JSONBean.java    | 2 +-
 .../java/org/apache/hadoop/hbase/util/TestJSONBean.java     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
index 0dbe0fdf78c..def2611b3a5 100644
--- a/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
+++ b/hbase-http/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
@@ -255,7 +255,7 @@ public class JSONBean {
     if ("modelerType".equals(attName)) {
       return;
     }
-    if (attName.indexOf("=") >= 0 || attName.indexOf(":") >= 0 || attName.indexOf(" ") >= 0) {
+    if (attName.indexOf("=") >= 0 || attName.indexOf(" ") >= 0) {
       return;
     }
 
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java
index 0db6d1232ff..c277cd068da 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java
@@ -59,7 +59,7 @@ public class TestJSONBean {
     MBeanInfo mbeanInfo = mock(MBeanInfo.class);
     when(mbeanInfo.getClassName()).thenReturn("testClassName");
     String[] attributeNames = new String[] {"intAttr", "nanAttr", "infinityAttr",
-      "strAttr", "boolAttr"};
+      "strAttr", "boolAttr", "test:Attr"};
     MBeanAttributeInfo[] attributeInfos = new MBeanAttributeInfo[attributeNames.length];
     for (int i = 0; i < attributeInfos.length; i++) {
       attributeInfos[i] = new MBeanAttributeInfo(attributeNames[i],
@@ -77,6 +77,7 @@ public class TestJSONBean {
       thenReturn(Double.POSITIVE_INFINITY);
     when(mbeanServer.getAttribute(any(), eq("strAttr"))).thenReturn("aString");
     when(mbeanServer.getAttribute(any(), eq("boolAttr"))).thenReturn(true);
+    when(mbeanServer.getAttribute(any(), eq("test:Attr"))).thenReturn("aString");
     return mbeanServer;
   }
 
@@ -92,7 +93,8 @@ public class TestJSONBean {
     pw.println("      \"nanAttr\": \"NaN\",");
     pw.println("      \"infinityAttr\": \"Infinity\",");
     pw.println("      \"strAttr\": \"aString\",");
-    pw.println("      \"boolAttr\": true");
+    pw.println("      \"boolAttr\": true,");
+    pw.println("      \"test:Attr\": aString");
     pw.println("    }");
     pw.println("  ]");
     pw.print("}");