This is an automated email from the ASF dual-hosted git repository. jlli pushed a commit to branch helix-1.0.3 in repository https://gitbox.apache.org/repos/asf/pinot.git
commit d873513564b2a00b817f647dff72097f7a20729f Author: Jack Li(Analytics Engineering) <[email protected]> AuthorDate: Fri May 20 20:59:23 2022 -0700 Bump up Helix version to 1.0.3 --- .../presto-pinot-driver/pom.xml | 2 +- .../api/resources/ZookeeperResource.java | 24 ++++++++++++---------- .../api/resources/ZookeeperResourceTest.java | 2 +- pom.xml | 2 +- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml index 7869799a4e..2797994c6e 100644 --- a/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml +++ b/pinot-connectors/prestodb-pinot-dependencies/presto-pinot-driver/pom.xml @@ -475,7 +475,7 @@ <dependency> <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> - <version>4.2.0</version> + <version>4.3.1</version> <scope>provided</scope> </dependency> </dependencies> diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java index c047efb728..042ac4fc80 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/api/resources/ZookeeperResource.java @@ -19,6 +19,10 @@ package org.apache.pinot.controller.api.resources; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import com.google.common.annotations.VisibleForTesting; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -43,15 +47,13 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.lang.StringUtils; import org.apache.helix.zookeeper.datamodel.ZNRecord; +import org.apache.helix.zookeeper.introspect.CodehausJacksonIntrospector; import org.apache.pinot.controller.api.access.AccessType; import org.apache.pinot.controller.api.access.Authenticate; import org.apache.pinot.controller.api.exception.ControllerApplicationException; import org.apache.pinot.controller.helix.core.PinotHelixResourceManager; import org.apache.pinot.spi.utils.JsonUtils; import org.apache.zookeeper.data.Stat; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -63,16 +65,16 @@ public class ZookeeperResource { // Helix uses codehaus.jackson.map.ObjectMapper, hence we can't use pinot JsonUtils here. @VisibleForTesting - static final ObjectMapper MAPPER = new ObjectMapper(); + static final ObjectMapper MAPPER = (new ObjectMapper()).setAnnotationIntrospector(new CodehausJacksonIntrospector()); static { - // Configuration should be identical to org.apache.helix.manager.zk.ZNRecordSerializer. - MAPPER.configure(SerializationConfig.Feature.INDENT_OUTPUT, true); - MAPPER.configure(SerializationConfig.Feature.AUTO_DETECT_FIELDS, true); - MAPPER.configure(SerializationConfig.Feature.CAN_OVERRIDE_ACCESS_MODIFIERS, true); - MAPPER.configure(DeserializationConfig.Feature.AUTO_DETECT_FIELDS, true); - MAPPER.configure(DeserializationConfig.Feature.AUTO_DETECT_SETTERS, true); - MAPPER.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, true); + // Configuration should be identical to org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer. + + MAPPER.enable(SerializationFeature.INDENT_OUTPUT); + MAPPER.enable(new MapperFeature[]{MapperFeature.AUTO_DETECT_FIELDS}); + MAPPER.enable(new MapperFeature[]{MapperFeature.CAN_OVERRIDE_ACCESS_MODIFIERS}); + MAPPER.enable(new MapperFeature[]{MapperFeature.AUTO_DETECT_SETTERS}); + MAPPER.enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); } @Inject diff --git a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ZookeeperResourceTest.java b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ZookeeperResourceTest.java index b04dc7d552..ff18acf766 100644 --- a/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ZookeeperResourceTest.java +++ b/pinot-controller/src/test/java/org/apache/pinot/controller/api/resources/ZookeeperResourceTest.java @@ -18,13 +18,13 @@ */ package org.apache.pinot.controller.api.resources; +import com.fasterxml.jackson.core.type.TypeReference; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.List; import org.apache.helix.zookeeper.datamodel.ZNRecord; import org.apache.pinot.common.utils.URIUtils; import org.apache.pinot.controller.ControllerTestUtils; -import org.codehaus.jackson.type.TypeReference; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; diff --git a/pom.xml b/pom.xml index b7a61cf4b8..51dc6d94e3 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,7 @@ <!-- Configuration for unit/integration tests section 1 of 3 (properties) ENDS HERE.--> <avro.version>1.9.2</avro.version> <parquet.version>1.11.1</parquet.version> - <helix.version>1.0.2</helix.version> + <helix.version>1.0.3</helix.version> <zkclient.version>0.7</zkclient.version> <jackson.version>2.10.0</jackson.version> <zookeeper.version>3.5.8</zookeeper.version> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
