From 476c286fcbad278d62b8f5cc126a779f2d16f015 Mon Sep 17 00:00:00 2001 From: Varghese Cottagiri Date: Fri, 17 Jul 2020 12:50:32 -0400 Subject: [PATCH] #683 - Replace deprecated KeeperException.Code constant references with corresponding enums --- .../org/apache/zookeeper/MockZooKeeper.java | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java b/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java index f82fad35be7e2..c064e5ad283d7 100644 --- a/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java +++ b/testmocks/src/main/java/org/apache/zookeeper/MockZooKeeper.java @@ -290,7 +290,7 @@ public void getData(final String path, boolean watch, final DataCallback cb, fin cb.processResult(failure.get().intValue(), path, ctx, null, null); return; } else if (stopped) { - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx, null, null); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx, null, null); return; } @@ -303,7 +303,7 @@ public void getData(final String path, boolean watch, final DataCallback cb, fin } if (value == null) { - cb.processResult(KeeperException.Code.NoNode, path, ctx, null, null); + cb.processResult(KeeperException.Code.NONODE.intValue(), path, ctx, null, null); } else { Stat stat = new Stat(); stat.setVersion(value.getRight()); @@ -356,13 +356,13 @@ public void getChildren(final String path, final Watcher watcher, final Children return; } else if (stopped) { mutex.unlock(); - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx, null); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx, null); return; } if (!tree.containsKey(path)) { mutex.unlock(); - cb.processResult(KeeperException.Code.NoNode, path, ctx, null); + cb.processResult(KeeperException.Code.NONODE.intValue(), path, ctx, null); return; } @@ -475,11 +475,11 @@ public void getChildren(final String path, boolean watcher, final Children2Callb return; } else if (stopped) { mutex.unlock(); - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx, null, null); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx, null, null); return; } else if (!tree.containsKey(path)) { mutex.unlock(); - cb.processResult(KeeperException.Code.NoNode, path, ctx, null, null); + cb.processResult(KeeperException.Code.NONODE.intValue(), path, ctx, null, null); return; } @@ -567,7 +567,7 @@ public void exists(String path, boolean watch, StatCallback cb, Object ctx) { return; } else if (stopped) { mutex.unlock(); - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx, null); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx, null); return; } @@ -576,7 +576,7 @@ public void exists(String path, boolean watch, StatCallback cb, Object ctx) { cb.processResult(0, path, ctx, new Stat()); } else { mutex.unlock(); - cb.processResult(KeeperException.Code.NoNode, path, ctx, null); + cb.processResult(KeeperException.Code.NONODE.intValue(), path, ctx, null); } }); } @@ -592,7 +592,7 @@ public void exists(String path, Watcher watcher, StatCallback cb, Object ctx) { return; } else if (stopped) { mutex.unlock(); - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx, null); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx, null); return; } @@ -605,7 +605,7 @@ public void exists(String path, Watcher watcher, StatCallback cb, Object ctx) { cb.processResult(0, path, ctx, new Stat()); } else { mutex.unlock(); - cb.processResult(KeeperException.Code.NoNode, path, ctx, null); + cb.processResult(KeeperException.Code.NONODE.intValue(), path, ctx, null); } }); } @@ -618,7 +618,7 @@ public void sync(String path, VoidCallback cb, Object ctx) { cb.processResult(failure.get().intValue(), path, ctx); return; } else if (stopped) { - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx); return; } @@ -675,7 +675,7 @@ public Stat setData(final String path, byte[] data, int version) throws KeeperEx @Override public void setData(final String path, final byte[] data, int version, final StatCallback cb, final Object ctx) { if (stopped) { - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx, null); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx, null); return; } @@ -691,13 +691,13 @@ public void setData(final String path, final byte[] data, int version, final Sta return; } else if (stopped) { mutex.unlock(); - cb.processResult(KeeperException.Code.ConnectionLoss, path, ctx, null); + cb.processResult(KeeperException.Code.CONNECTIONLOSS.intValue(), path, ctx, null); return; } if (!tree.containsKey(path)) { mutex.unlock(); - cb.processResult(KeeperException.Code.NoNode, path, ctx, null); + cb.processResult(KeeperException.Code.NONODE.intValue(), path, ctx, null); return; } @@ -707,7 +707,7 @@ public void setData(final String path, final byte[] data, int version, final Sta if (version != -1 && version != currentVersion) { log.debug("[{}] Current version: {} -- Expected: {}", path, currentVersion, version); mutex.unlock(); - cb.processResult(KeeperException.Code.BadVersion, path, ctx, null); + cb.processResult(KeeperException.Code.BADVERSION.intValue(), path, ctx, null); return; }