[zookeeper] branch master updated: ZOOKEEPER-4464: zooinspector display "Ephemeral Owner" in hex for easy match to jmx session

[symat]

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

symat 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 d7cb4e8  ZOOKEEPER-4464: zooinspector display "Ephemeral Owner" in hex 
for easy match to jmx session
d7cb4e8 is described below

commit d7cb4e8b7b14ea94e7ea8cd2a8e43fa7e8668132
Author: 67 <6...@gd67.com>
AuthorDate: Tue Mar 29 09:52:54 2022 +0000

    ZOOKEEPER-4464: zooinspector display "Ephemeral Owner" in hex for easy 
match to jmx session
    
    zooinspector now show "Ephemeral Owner" in 10 base number while JMX 
connections show in hex format. this makes it a little hard to match them.
    
    It will be much better if hex format is shown too, I will create a pr add 
hex format just beside the 10 based one.
    
    Author: 67 <6...@gd67.com>
    
    Reviewers: Enrico Olivelli <eolive...@apache.org>, Mohammad Arshad 
<ars...@apache.org>, Mate Szalay-Beko <sy...@apache.org>
    
    Closes #1813 from iamgd67/ZOOKEEPER-4464
---
 .../inspector/gui/nodeviewer/NodeViewerMetaData.java    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git 
a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
 
b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
index 5c2df8d..6a369c5 100644
--- 
a/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
+++ 
b/zookeeper-contrib/zookeeper-contrib-zooinspector/src/main/java/org/apache/zookeeper/inspector/gui/nodeviewer/NodeViewerMetaData.java
@@ -118,7 +118,7 @@ public class NodeViewerMetaData extends 
ZooInspectorNodeViewer {
                     for (Map.Entry<String, String> entry : data.entrySet()) {
                         rowPos = 2 * i + 1;
                         JLabel label = new JLabel(entry.getKey());
-                        JTextField text = new JTextField(entry.getValue());
+                        JTextField text = new 
JTextField(formatValByKeyType(entry.getKey(),entry.getValue()));
                         text.setEditable(false);
                         GridBagConstraints c1 = new GridBagConstraints();
                         c1.gridx = 0;
@@ -164,6 +164,21 @@ public class NodeViewerMetaData extends 
ZooInspectorNodeViewer {
                     NodeViewerMetaData.this.metaDataPanel.revalidate();
                     NodeViewerMetaData.this.metaDataPanel.repaint();
                 }
+
+                private String formatValByKeyType(String key, String value) {
+                    if(key==null) return value;
+                    String formatedVal=value;
+                    switch (key){
+                        case "Ephemeral Owner":
+                            try{
+                                formatedVal = String.format("0x%x", 
Long.parseLong(value));
+                            }catch (NumberFormatException e){
+                                LoggerFactory.getLogger().warn("parse {}'s 
value {} to hex fail",key,value,e);
+                            }
+                            break;
+                    }
+                    return formatedVal;
+                }
             };
             worker.execute();
         }