Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-24657 fix JsonBean.java from HBASE-23015 HBASE-20571 (branch-1) 

Closes #1999

Signed-off-by: Andrew Purtell <apurtell@apache.org>
Signed-off-by: Bharath Vissapragada <bharathv@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
This commit is contained in:
David Manning 2020-07-02 19:02:01 +05:30 committed by Viraj Jasani
parent 32690e1e89
commit 15c20be6ff
No known key found for this signature in database
GPG Key ID: B3D6C0B41C8ADFD5
2 changed files with 114 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbase-server/src/main/java/org/apache/hadoop/hbase/util/JSONBean.java
View File

@ -334,7 +334,7 @@ public class JSONBean {
} else if(value instanceof Number) {
Number n = (Number)value;
double doubleValue = n.doubleValue();
if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) {
if (!Double.isNaN(doubleValue) && !Double.isInfinite(doubleValue)) {
writer.value(n);
} else {
writer.value(n.toString());

113
hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestJSONBean.java Normal file
View File

@ -0,0 +1,113 @@
/**
*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.hbase.util;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.google.common.reflect.TypeToken;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import javax.management.MBeanAttributeInfo;
import javax.management.MBeanInfo;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.management.QueryExp;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hbase.thirdparty.com.google.gson.Gson;
import org.junit.Test;
import org.junit.experimental.categories.Category;
/**
* Test {@link JSONBean}.
*/
@Category({MiscTests.class, SmallTests.class})
public class TestJSONBean {
private MBeanServer getMockMBeanServer() throws Exception {
MBeanServer mbeanServer = mock(MBeanServer.class);
Set<ObjectName> names = new HashSet<>();
names.add(new ObjectName("test1:type=test2"));
when(mbeanServer.queryNames(any(ObjectName.class), any(QueryExp.class))).thenReturn(names);
MBeanInfo mbeanInfo = mock(MBeanInfo.class);
when(mbeanInfo.getClassName()).thenReturn("testClassName");
String[] attributeNames = new String[] {"intAttr", "nanAttr", "infinityAttr",
"strAttr", "boolAttr"};
MBeanAttributeInfo[] attributeInfos = new MBeanAttributeInfo[attributeNames.length];
for (int i = 0; i < attributeInfos.length; i++) {
attributeInfos[i] = new MBeanAttributeInfo(attributeNames[i],
null,
null,
true,
false,
false);
}
when(mbeanInfo.getAttributes()).thenReturn(attributeInfos);
when(mbeanServer.getMBeanInfo(any(ObjectName.class))).thenReturn(mbeanInfo);
when(mbeanServer.getAttribute(any(ObjectName.class), eq("intAttr"))).thenReturn(3);
when(mbeanServer.getAttribute(any(ObjectName.class), eq("nanAttr"))).thenReturn(Double.NaN);
when(mbeanServer.getAttribute(any(ObjectName.class), eq("infinityAttr"))).
thenReturn(Double.POSITIVE_INFINITY);
when(mbeanServer.getAttribute(any(ObjectName.class), eq("strAttr"))).thenReturn("aString");
when(mbeanServer.getAttribute(any(ObjectName.class), eq("boolAttr"))).thenReturn(true);
return mbeanServer;
}
private String getExpectedJSON() {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
pw.println("{");
pw.println(" \"beans\": [");
pw.println(" {");
pw.println(" \"name\": \"test1:type=test2\",");
pw.println(" \"modelerType\": \"testClassName\",");
pw.println(" \"intAttr\": 3,");
pw.println(" \"nanAttr\": \"NaN\",");
pw.println(" \"infinityAttr\": \"Infinity\",");
pw.println(" \"strAttr\": \"aString\",");
pw.println(" \"boolAttr\": true");
pw.println(" }");
pw.println(" ]");
pw.print("}");
return sw.toString();
}
@Test
public void testJSONBeanValueTypes() throws Exception {
JSONBean bean = new JSONBean();
StringWriter stringWriter = new StringWriter();
try (
PrintWriter printWriter = new PrintWriter(stringWriter);
JSONBean.Writer jsonWriter = bean.open(printWriter)) {
jsonWriter.write(getMockMBeanServer(), null, null, false);
}
final Gson gson = GsonUtil.createGson().create();
Type typeOfHashMap = new TypeToken<Map<String, Object>>() {}.getType();
Map<String, Object> expectedJson = gson.fromJson(getExpectedJSON(), typeOfHashMap);
Map<String, Object> actualJson = gson.fromJson(stringWriter.toString(), typeOfHashMap);
assertEquals(expectedJson, actualJson);
}
}