[zookeeper] branch master updated: ZOOKEEPER-4001: Make AuditHelper.addAuditLog(...) more readable

[maoling]

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

maoling pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new ae5443e  ZOOKEEPER-4001: Make AuditHelper.addAuditLog(...) more 
readable
ae5443e is described below

commit ae5443e2c5ba67fcfe3decac084f6dff9ab8a383
Author: zengchao1212 <zengchao1...@gmail.com>
AuthorDate: Tue Feb 2 15:11:39 2021 +0800

    ZOOKEEPER-4001: Make AuditHelper.addAuditLog(...) more readable
    
    Author: zengchao1212 <zengchao1...@gmail.com>
    
    Reviewers: maoling <maol...@apache.org>
    
    Closes #1537 from zengchao1212/ZOOKEEPER-4001
---
 .../org/apache/zookeeper/audit/AuditHelper.java    | 29 +++++-----------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/audit/AuditHelper.java 
b/zookeeper-server/src/main/java/org/apache/zookeeper/audit/AuditHelper.java
index ec4ca13..b98c42d 100644
--- a/zookeeper-server/src/main/java/org/apache/zookeeper/audit/AuditHelper.java
+++ b/zookeeper-server/src/main/java/org/apache/zookeeper/audit/AuditHelper.java
@@ -70,14 +70,11 @@ public final class AuditHelper {
                 case ZooDefs.OpCode.create2:
                 case ZooDefs.OpCode.createContainer:
                     op = AuditConstants.OP_CREATE;
+                    CreateRequest createRequest = new CreateRequest();
+                    deserialize(request, createRequest);
+                    createMode = getCreateMode(createRequest);
                     if (failedTxn) {
-                        CreateRequest createRequest = new CreateRequest();
-                        deserialize(request, createRequest);
                         path = createRequest.getPath();
-                        createMode =
-                                getCreateMode(createRequest);
-                    } else {
-                        createMode = getCreateMode(request);
                     }
                     break;
                 case ZooDefs.OpCode.delete:
@@ -99,13 +96,11 @@ public final class AuditHelper {
                     break;
                 case ZooDefs.OpCode.setACL:
                     op = AuditConstants.OP_SETACL;
+                    SetACLRequest setACLRequest = new SetACLRequest();
+                    deserialize(request, setACLRequest);
+                    acls = ZKUtil.aclToString(setACLRequest.getAcl());
                     if (failedTxn) {
-                        SetACLRequest setACLRequest = new SetACLRequest();
-                        deserialize(request, setACLRequest);
                         path = setACLRequest.getPath();
-                        acls = ZKUtil.aclToString(setACLRequest.getAcl());
-                    } else {
-                        acls = getACLs(request);
                     }
                     break;
                 case ZooDefs.OpCode.multi:
@@ -188,18 +183,6 @@ public final class AuditHelper {
         ZKAuditProvider.log(user, operation, znode, acl, createMode, session, 
ip, result);
     }
 
-    private static String getACLs(Request request) throws IOException {
-        SetACLRequest setACLRequest = new SetACLRequest();
-        deserialize(request, setACLRequest);
-        return ZKUtil.aclToString(setACLRequest.getAcl());
-    }
-
-    private static String getCreateMode(Request request) throws IOException, 
KeeperException {
-        CreateRequest createRequest = new CreateRequest();
-        deserialize(request, createRequest);
-        return getCreateMode(createRequest);
-    }
-
     private static String getCreateMode(CreateRequest createRequest) throws 
KeeperException {
         return 
CreateMode.fromFlag(createRequest.getFlags()).toString().toLowerCase();
     }