Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions clients/kie-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
<artifactId>jackson-databind</artifactId>
</dependency>

<!-- Jackson Accessor -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Map;
import java.util.Map.Entry;

import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import org.apache.http.HttpStatus;
import org.apache.servicecomb.kie.client.http.HttpResponse;
import org.apache.servicecomb.kie.client.model.KVBody;
Expand Down Expand Up @@ -70,7 +71,7 @@ public KieClient(KieRawClient serviceCenterRawClient) {
*/
public String putKeyValue(String key, KVBody kvBody) {
try {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
HttpResponse response = httpClient.putHttpRequest("/kie/kv/" + key, null, mapper.writeValueAsString(kvBody));
if (response.getStatusCode() == HttpStatus.SC_OK) {
return response.getContent();
Expand All @@ -94,7 +95,7 @@ public List<KVResponse> getValueOfKey(String key) {
try {
HttpResponse response = httpClient.getHttpRequest("/kie/kv/" + key, null, null);
if (response.getStatusCode() == HttpStatus.SC_OK) {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
return mapper.readValue(response.getContent(), new TypeReference<List<KVResponse>>() {
});
} else {
Expand Down Expand Up @@ -125,7 +126,7 @@ public List<KVResponse> searchKeyValueByLabels(Map<String, String> labels) {
stringBuilder.deleteCharAt(stringBuilder.length() - 1);
HttpResponse response = httpClient.getHttpRequest("/kie/kv?q=" + stringBuilder.toString(), null, null);
if (response.getStatusCode() == HttpStatus.SC_OK) {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
return mapper.readValue(response.getContent(), new TypeReference<List<KVResponse>>() {
});
} else {
Expand Down Expand Up @@ -157,4 +158,10 @@ public void deleteKeyValue(KVDoc kvDoc) {
LOGGER.error("delete keyValue fails", e);
}
}

private ObjectMapper buildAfterBurnerObjectMapper(){
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new AfterburnerModule());
return mapper;
}
}
6 changes: 6 additions & 0 deletions clients/service-center-client/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,12 @@
<artifactId>jackson-databind</artifactId>
</dependency>

<!-- Jackson Accessor -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.net.URISyntaxException;
import java.util.Map;

import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import org.apache.http.HttpStatus;
import org.apache.http.client.utils.URIBuilder;
import org.apache.servicecomb.service.center.client.exception.OperationException;
Expand Down Expand Up @@ -132,7 +133,7 @@ public MicroserviceInstancesResponse getServiceCenterInstances() {
try {
HttpResponse response = httpClient.getHttpRequest("/registry/health", null, null);
if (response.getStatusCode() == HttpStatus.SC_OK) {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
return mapper.readValue(response.getContent(), MicroserviceInstancesResponse.class);
} else {
throw new OperationException(
Expand All @@ -155,7 +156,7 @@ public MicroserviceInstancesResponse getServiceCenterInstances() {
*/
public String registerMicroservice(Microservice microservice) {
try {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
HttpResponse response = httpClient
.postHttpRequest("/registry/microservices", null, mapper.writeValueAsString(microservice));
Expand Down Expand Up @@ -183,7 +184,7 @@ public MicroservicesResponse getMicroserviceList() {
try {
HttpResponse response = httpClient.getHttpRequest("/registry/microservices", null, null);
if (response.getStatusCode() == HttpStatus.SC_OK) {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
return mapper.readValue(response.getContent(), MicroservicesResponse.class);
} else {
Expand Down Expand Up @@ -243,7 +244,7 @@ public Microservice getMicroserviceByServiceId(String serviceId) {
try {
HttpResponse response = httpClient.getHttpRequest("/registry/microservices/" + serviceId, null, null);
if (response.getStatusCode() == HttpStatus.SC_OK) {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
JsonNode jsonNode = mapper.readTree(response.getContent());
return mapper.readValue(jsonNode.get("service").toString(), Microservice.class);
Expand All @@ -269,7 +270,7 @@ public Microservice getMicroserviceByServiceId(String serviceId) {
*/
public String registerMicroserviceInstance(MicroserviceInstance instance, String serviceId) {
try {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true);
HttpResponse response = httpClient.postHttpRequest("/registry/microservices/" + serviceId + "/instances", null,
mapper.writeValueAsString(instance));
Expand Down Expand Up @@ -299,7 +300,7 @@ public MicroserviceInstancesResponse getMicroserviceInstanceList(String serviceI
HttpResponse response = httpClient
.getHttpRequest("/registry/microservices/" + serviceId + "/instances", null, null);
if (response.getStatusCode() == HttpStatus.SC_OK) {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
return mapper.readValue(response.getContent(), MicroserviceInstancesResponse.class);
} else {
throw new OperationException(
Expand Down Expand Up @@ -327,7 +328,7 @@ public MicroserviceInstance getMicroserviceInstance(String serviceId, String ins
HttpResponse response = httpClient
.getHttpRequest("/registry/microservices/" + serviceId + "/instances/" + instanceId, null, null);
if (response.getStatusCode() == HttpStatus.SC_OK) {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
JsonNode jsonNode = mapper.readTree(response.getContent());
return mapper.readValue(jsonNode.get("instance").toString(), MicroserviceInstance.class);
} else {
Expand Down Expand Up @@ -406,7 +407,7 @@ public boolean updateMicroserviceInstanceStatus(String serviceId, String instanc
*/
public void sendHeartBeats(HeartbeatsRequest heartbeatsRequest) {
try {
ObjectMapper mapper = new ObjectMapper();
ObjectMapper mapper = buildAfterBurnerObjectMapper();
HttpResponse response = httpClient
.putHttpRequest("/registry/heartbeats", null, mapper.writeValueAsString(heartbeatsRequest));

Expand All @@ -422,4 +423,10 @@ public void sendHeartBeats(HeartbeatsRequest heartbeatsRequest) {
"heartbeats fails ", e);
}
}

private ObjectMapper buildAfterBurnerObjectMapper(){
ObjectMapper mapper = new ObjectMapper();
mapper.registerModule(new AfterburnerModule());
return mapper;
}
}
6 changes: 6 additions & 0 deletions foundations/foundation-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
<name>Java Chassis::Foundations::Common</name>

<dependencies>
<!-- Jackson Accessor -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,16 @@
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.module.afterburner.AfterburnerModule;

public final class JsonUtils {
public static final ObjectMapper OBJ_MAPPER;

static {
OBJ_MAPPER = new ObjectMapper();
OBJ_MAPPER.registerModule(new AfterburnerModule());
OBJ_MAPPER.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
OBJ_MAPPER.disable(SerializationFeature.FAIL_ON_EMPTY_BEANS);

// SimpleModule partDeserializeModule = new SimpleModule("partDeserializeModule",
// new Version(0, 0, 1, null, "javax.servlet", "javax.servlet-api")
// );
// partDeserializeModule.addSerializer(Part.class, new JavaxServletPartSerializer());
// partDeserializeModule.addDeserializer(Part.class, new JavaxServletPartDeserializer());
// OBJ_MAPPER.registerModule(partDeserializeModule);
}

private JsonUtils() {
Expand Down
6 changes: 6 additions & 0 deletions foundations/foundation-protobuf/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@
<name>Java Chassis::Foundations::Protobuf</name>

<dependencies>
<!-- Jackson Accessor -->
<dependency>
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-afterburner</artifactId>
</dependency>

<dependency>
<groupId>org.apache.servicecomb</groupId>
<artifactId>foundation-common</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.servicecomb.foundation.protobuf;

import com.fasterxml.jackson.module.afterburner.AfterburnerModule;
import org.apache.servicecomb.foundation.protobuf.internal.bean.BeanDescriptorManager;
import org.apache.servicecomb.foundation.protobuf.internal.parser.ProtoParser;

Expand All @@ -35,9 +36,9 @@ public class ProtoMapperFactory {
private ProtoParser protoParser = new ProtoParser();

public ProtoMapperFactory() {
jsonMapper.registerModule(new AfterburnerModule());
jsonMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
jsonMapper.setSerializationInclusion(Include.NON_NULL);
// jsonMapper.enableDefaultTyping(ObjectMapper.DefaultTyping.OBJECT_AND_NON_CONCRETE, JsonTypeInfo.As.PROPERTY);

beanDescriptorManager = new BeanDescriptorManager(jsonMapper.getSerializationConfig());
}
Expand Down