This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch feature/GEODE-5013
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-5013 by this
push:
new 674dbec Incorporating review comments
674dbec is described below
commit 674dbec34d5a1cf3331ecf512b1ffdea2c5e9a60
Author: Bruce Schuchardt <[email protected]>
AuthorDate: Thu Mar 14 14:27:59 2019 -0700
Incorporating review comments
---
.../LocatorLauncherRemoteIntegrationTestCase.java | 1 -
.../internal/cli/json/AbstractJSONFormatter.java | 18 +++++++++---------
.../management/internal/cli/json/GfJsonArray.java | 6 ++++++
geode-web-api/build.gradle | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
index cff5c60..34f8f31 100644
---
a/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
+++
b/geode-core/src/integrationTest/java/org/apache/geode/distributed/LocatorLauncherRemoteIntegrationTestCase.java
@@ -199,7 +199,6 @@ public abstract class
LocatorLauncherRemoteIntegrationTestCase
try {
assertThat(launcher.status().getStatus()).isEqualTo(Status.ONLINE);
} catch (Exception e) {
- e.printStackTrace();
throw new AssertionError(statusFailedWithException(e), e);
}
});
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/AbstractJSONFormatter.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/AbstractJSONFormatter.java
index 1ef7992..5698a4c 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/AbstractJSONFormatter.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/AbstractJSONFormatter.java
@@ -183,7 +183,7 @@ public abstract class AbstractJSONFormatter {
gen.setCurrentValue(value);
WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen,
typeSer.typeId(value, JsonToken.START_OBJECT));
- _serialize(value, gen);
+ serializeElements(value, gen);
typeSer.writeTypeSuffix(gen, typeIdDef);
}
@@ -191,11 +191,11 @@ public abstract class AbstractJSONFormatter {
public void serialize(Collection value, JsonGenerator gen,
SerializerProvider serializers)
throws IOException {
gen.writeStartObject();
- _serialize(value, gen);
+ serializeElements(value, gen);
gen.writeEndObject();
}
- void _serialize(Collection value, JsonGenerator gen) throws IOException {
+ void serializeElements(Collection value, JsonGenerator gen) throws
IOException {
Iterator<Object> objects = value.iterator();
for (int i = 0; i < maxCollectionElements && objects.hasNext(); i++) {
Object nextObject = objects.next();
@@ -217,7 +217,7 @@ public abstract class AbstractJSONFormatter {
throws IOException {
WritableTypeId writableTypeId = typeSer.typeId(value,
JsonToken.START_OBJECT);
typeSer.writeTypePrefix(gen, writableTypeId);
- _serialize(value, gen);
+ serializeFields(value, gen);
typeSer.writeTypeSuffix(gen, writableTypeId);
}
@@ -225,11 +225,11 @@ public abstract class AbstractJSONFormatter {
public void serialize(PdxInstance value, JsonGenerator gen,
SerializerProvider serializers)
throws IOException {
gen.writeStartObject();
- _serialize(value, gen);
+ serializeFields(value, gen);
gen.writeEndObject();
}
- void _serialize(PdxInstance value, JsonGenerator gen) throws IOException {
+ void serializeFields(PdxInstance value, JsonGenerator gen) throws
IOException {
for (String field : value.getFieldNames()) {
gen.writeObjectField(field, value.getField(field));
}
@@ -247,7 +247,7 @@ public abstract class AbstractJSONFormatter {
SerializerProvider serializers, TypeSerializer typeSer)
throws IOException {
typeSer.writeTypePrefix(gen, typeSer.typeId(value,
JsonToken.START_OBJECT));
- _serialize(value, gen);
+ serializeElements(value, gen);
typeSer.writeTypeSuffix(gen, typeSer.typeId(value,
JsonToken.START_OBJECT));
}
@@ -255,11 +255,11 @@ public abstract class AbstractJSONFormatter {
public void serialize(StructImpl value, JsonGenerator gen,
SerializerProvider serializers)
throws IOException {
gen.writeStartObject();
- _serialize(value, gen);
+ serializeElements(value, gen);
gen.writeEndObject();
}
- void _serialize(StructImpl value, JsonGenerator gen) throws IOException {
+ void serializeElements(StructImpl value, JsonGenerator gen) throws
IOException {
String[] fields = value.getFieldNames();
Object[] values = value.getFieldValues();
for (int i = 0; i < fields.length; i++) {
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
index a5fde33..af90541 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/json/GfJsonArray.java
@@ -18,6 +18,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import org.apache.logging.log4j.Logger;
@@ -59,6 +60,11 @@ public class GfJsonArray extends AbstractJSONFormatter {
}
}
+ void postCreateMapper() {
+ mapper.configure(JsonParser.Feature.ALLOW_UNQUOTED_FIELD_NAMES, true);
+ mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
+ }
+
/**
* Get the object value associated with an index.
*
diff --git a/geode-web-api/build.gradle b/geode-web-api/build.gradle
index 7ca4f38..418e0d7 100644
--- a/geode-web-api/build.gradle
+++ b/geode-web-api/build.gradle
@@ -24,7 +24,7 @@ dependencies {
compile(platform(project(':boms:geode-all-bom')))
compileOnly(platform(project(':boms:geode-all-bom')))
- compile(project(':geode-json'))
+ integrationTestCompile(project(':geode-json'))
compileOnly(project(':geode-core'))
