You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by hu...@apache.org on 2020/06/15 21:14:22 UTC
[helix] branch master updated: Move serializers to zookeeper-api
(#1085)
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new b9af362 Move serializers to zookeeper-api (#1085)
b9af362 is described below
commit b9af362cb46019df82ab9b637f59641ad0b02290
Author: Hunter Lee <hu...@linkedin.com>
AuthorDate: Mon Jun 15 14:14:11 2020 -0700
Move serializers to zookeeper-api (#1085)
Some serializer implementations (Chained, ByteArray) were never moved to zookeeper-api. This commit moves them out of helix-core and into zookeeper-api.
Note that this might cause older implementations of Helix applications to no longer build. Since this is an API-level change that simply moves the classes, the user can simply update the package path in the import statements and can make it build again.
---
.../org/apache/helix/webapp/HelixAdminWebApp.java | 4 ++--
.../helix/manager/zk/ByteArraySerializer.java | 21 ++++++---------------
.../org/apache/helix/manager/zk/ZKHelixManager.java | 3 ++-
.../apache/helix/manager/zk/ZkBaseDataAccessor.java | 1 +
.../apache/helix/tools/commandtools/ZKDumper.java | 2 +-
.../org/apache/helix/tools/commandtools/ZkCopy.java | 2 +-
.../datamodel/serializer}/ByteArraySerializer.java | 2 +-
.../serializer}/ChainedPathZkSerializer.java | 4 ++--
8 files changed, 16 insertions(+), 23 deletions(-)
diff --git a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java
index a68c85d..37f5d61 100644
--- a/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java
+++ b/helix-admin-webapp/src/main/java/org/apache/helix/webapp/HelixAdminWebApp.java
@@ -19,8 +19,8 @@ package org.apache.helix.webapp;
* under the License.
*/
-import org.apache.helix.manager.zk.ByteArraySerializer;
-import org.apache.helix.manager.zk.ZNRecordSerializer;
+import org.apache.helix.zookeeper.datamodel.serializer.ByteArraySerializer;
+import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer;
import org.apache.helix.zookeeper.impl.client.ZkClient;
import org.apache.helix.webapp.resources.ResourceUtil;
import org.restlet.Component;
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ByteArraySerializer.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ByteArraySerializer.java
index a1889ea..294ce8f 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ByteArraySerializer.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ByteArraySerializer.java
@@ -19,19 +19,10 @@ package org.apache.helix.manager.zk;
* under the License.
*/
-import org.apache.helix.zookeeper.zkclient.exception.ZkMarshallingError;
-import org.apache.helix.zookeeper.zkclient.serialize.ZkSerializer;
-
-
-public class ByteArraySerializer implements ZkSerializer {
- @Override
- public byte[] serialize(Object data) throws ZkMarshallingError {
- return (byte[]) data;
- }
-
- @Override
- public Object deserialize(byte[] bytes) throws ZkMarshallingError {
- return bytes;
- }
-
+/**
+ * Deprecated - use the one in zookeeper-api instead.
+ */
+@Deprecated
+public class ByteArraySerializer
+ extends org.apache.helix.zookeeper.datamodel.serializer.ByteArraySerializer {
}
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
index e2429d7..0b365d4 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixManager.java
@@ -100,7 +100,8 @@ import org.apache.zookeeper.Watcher.Event.EventType;
import org.apache.zookeeper.Watcher.Event.KeeperState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
+import org.apache.helix.zookeeper.datamodel.serializer.ChainedPathZkSerializer;
+import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer;
public class ZKHelixManager implements HelixManager, IZkStateListener {
private static Logger LOG = LoggerFactory.getLogger(ZKHelixManager.class);
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
index 3706b2d..182dc2a 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
+++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZkBaseDataAccessor.java
@@ -53,6 +53,7 @@ import org.apache.helix.zookeeper.zkclient.exception.ZkException;
import org.apache.helix.zookeeper.zkclient.exception.ZkNoNodeException;
import org.apache.helix.zookeeper.zkclient.exception.ZkNodeExistsException;
import org.apache.helix.zookeeper.zkclient.serialize.ZkSerializer;
+import org.apache.helix.zookeeper.zkclient.serialize.PathBasedZkSerializer;
import org.apache.helix.zookeeper.datamodel.serializer.ZNRecordSerializer;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException.Code;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKDumper.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKDumper.java
index bb69e9d..fd676c8 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKDumper.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKDumper.java
@@ -36,7 +36,7 @@ import org.apache.commons.cli.OptionBuilder;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.PosixParser;
-import org.apache.helix.manager.zk.ByteArraySerializer;
+import org.apache.helix.zookeeper.datamodel.serializer.ByteArraySerializer;
import org.apache.helix.zookeeper.api.client.HelixZkClient;
import org.apache.helix.zookeeper.impl.factory.SharedZkClientFactory;
import org.apache.helix.zookeeper.zkclient.serialize.ZkSerializer;
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZkCopy.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZkCopy.java
index af112a6..988d76e 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZkCopy.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZkCopy.java
@@ -35,7 +35,7 @@ import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.helix.AccessOption;
import org.apache.helix.BaseDataAccessor;
-import org.apache.helix.manager.zk.ByteArraySerializer;
+import org.apache.helix.zookeeper.datamodel.serializer.ByteArraySerializer;
import org.apache.helix.manager.zk.ZkBaseDataAccessor;
import org.apache.helix.zookeeper.api.client.HelixZkClient;
import org.apache.helix.zookeeper.impl.factory.SharedZkClientFactory;
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ByteArraySerializer.java b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/datamodel/serializer/ByteArraySerializer.java
similarity index 95%
copy from helix-core/src/main/java/org/apache/helix/manager/zk/ByteArraySerializer.java
copy to zookeeper-api/src/main/java/org/apache/helix/zookeeper/datamodel/serializer/ByteArraySerializer.java
index a1889ea..2d52cb8 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ByteArraySerializer.java
+++ b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/datamodel/serializer/ByteArraySerializer.java
@@ -1,4 +1,4 @@
-package org.apache.helix.manager.zk;
+package org.apache.helix.zookeeper.datamodel.serializer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ChainedPathZkSerializer.java b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/datamodel/serializer/ChainedPathZkSerializer.java
similarity index 96%
rename from helix-core/src/main/java/org/apache/helix/manager/zk/ChainedPathZkSerializer.java
rename to zookeeper-api/src/main/java/org/apache/helix/zookeeper/datamodel/serializer/ChainedPathZkSerializer.java
index bb815c1..a5e416b 100644
--- a/helix-core/src/main/java/org/apache/helix/manager/zk/ChainedPathZkSerializer.java
+++ b/zookeeper-api/src/main/java/org/apache/helix/zookeeper/datamodel/serializer/ChainedPathZkSerializer.java
@@ -1,4 +1,4 @@
-package org.apache.helix.manager.zk;
+package org.apache.helix.zookeeper.datamodel.serializer;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,9 +24,9 @@ import java.util.Collections;
import java.util.List;
import org.apache.helix.zookeeper.zkclient.exception.ZkMarshallingError;
+import org.apache.helix.zookeeper.zkclient.serialize.PathBasedZkSerializer;
import org.apache.helix.zookeeper.zkclient.serialize.ZkSerializer;
-
public class ChainedPathZkSerializer implements PathBasedZkSerializer {
public static class Builder {