[accumulo] branch main updated: Narrow static util method, writer not needed, use ZooReader (#2694)

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

ctubbsii pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/main by this push:
     new c847b73f27 Narrow static util method, writer not needed, use ZooReader 
(#2694)
c847b73f27 is described below

commit c847b73f27a7e39d87f2f9747e4aac5ec1054262
Author: EdColeman <d...@etcoleman.com>
AuthorDate: Thu May 12 10:26:21 2022 -0400

    Narrow static util method, writer not needed, use ZooReader (#2694)
---
 .../org/apache/accumulo/server/conf/store/impl/ZooPropStore.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
 
b/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
index f8449f0497..fcae0d7ba6 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
@@ -28,6 +28,7 @@ import java.util.function.BiFunction;
 
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.metrics.MetricsUtil;
+import org.apache.accumulo.fate.zookeeper.ZooReader;
 import org.apache.accumulo.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
@@ -196,8 +197,8 @@ public class ZooPropStore implements PropStore, 
PropChangeListener {
    *          the prop cache key
    * @param watcher
    *          a prop store watcher that will receive / handle ZooKeeper events.
-   * @param zrw
-   *          a ZooReaderWriter
+   * @param zooReader
+   *          a ZooReader
    * @return the versioned properties or null if the node does not exist.
    * @throws IOException
    *           if the underlying data from the ZooKeeper node cannot be 
decoded.
@@ -207,11 +208,11 @@ public class ZooPropStore implements PropStore, 
PropChangeListener {
    *           if the ZooKeeper read was interrupted.
    */
   public static @Nullable VersionedProperties readFromZk(final PropCacheKey<?> 
propCacheKey,
-      final PropStoreWatcher watcher, final ZooReaderWriter zrw)
+      final PropStoreWatcher watcher, final ZooReader zooReader)
       throws IOException, KeeperException, InterruptedException {
     try {
       Stat stat = new Stat();
-      byte[] bytes = zrw.getData(propCacheKey.getPath(), watcher, stat);
+      byte[] bytes = zooReader.getData(propCacheKey.getPath(), watcher, stat);
       return codec.fromBytes(stat.getVersion(), bytes);
     } catch (KeeperException.NoNodeException ex) {
       // ignore no node - allow other exceptions to propagate