- Moved UUID.cache into NameCache

- Changed UUID.get() -> NameCache.get() in Byteman scripts

conf/scripts/BecomeServerTest/testSendingOfMsgsOnUnconnectedChannel.btm

@@ -53,7 +53,7 @@ HELPER org.jgroups.tests.helpers.BecomeServerTestHelper
 AFTER INVOKE queueMessage ALL
 BIND queue=$0.become_server_queue;
      is_server=$0.is_server;
-     local_addr_name=org.jgroups.util.UUID.get($0.local_addr);
+     local_addr_name=org.jgroups.util.NameCache.get($0.local_addr);
 IF !is_server && local_addr_name.equals("B") && messageReceived(queue)
   DO rendezvous("rv");
 ENDRULE
@@ -66,7 +66,7 @@ RULE InstallView
 CLASS ClientGmsImpl
 METHOD installView
 AT ENTRY
-BIND local_addr_name=org.jgroups.util.UUID.get($0.gms.local_addr);
+BIND local_addr_name=org.jgroups.util.NameCache.get($0.gms.local_addr);
 IF local_addr_name.equals("B") AND rendezvous("rv") != -1
    DO System.out.println("--> B: installView() waiting on rendezvous until message has been received");
       rendezvous("rv");
@@ -80,7 +80,7 @@ CLASS NAKACK2
 METHOD flushBecomeServerQueue
 AT ENTRY
 BIND queue=$0.become_server_queue;
-     local_addr_name=org.jgroups.util.UUID.get($0.local_addr);
+     local_addr_name=org.jgroups.util.NameCache.get($0.local_addr);
 IF local_addr_name.equals("B")
     DO System.out.println("--> " + $0.local_addr + ": flushing queue (" + queue.size() + " element(s))");
 ENDRULE

conf/scripts/ForwardToCoordFailoverTest/testSendingDuringViewChange.btm

@@ -13,7 +13,7 @@ CLASS ForwardQueue
 METHOD doFlush
 HELPER org.jgroups.tests.helpers.ForwardToCoordFailoverTestHelper
 AT READ flushing ALL
-BIND local_addr_name=org.jgroups.util.UUID.get($0.local_addr);
+BIND local_addr_name=org.jgroups.util.NameCache.get($0.local_addr);
      map:java.util.Map=$0.forward_table;
      empty=map.isEmpty();
 IF !empty && local_addr_name.equals("C")

conf/scripts/SequencerFailoverTest/testResendingVersusNewMessages.btm

@@ -13,7 +13,7 @@ CLASS SEQUENCER
 METHOD startFlusher
 HELPER org.jgroups.tests.helpers.SequencerFailoverTestHelper
 AFTER WRITE flushing ALL
-BIND local_addr_name=org.jgroups.util.UUID.get($0.local_addr);
+BIND local_addr_name=org.jgroups.util.NameCache.get($0.local_addr);
      map:java.util.Map=$0.forward_table;
      empty=map.isEmpty();
      flushing=$0.flushing

src/org/jgroups/Channel.java

@@ -6,8 +6,8 @@
 import org.jgroups.annotations.ManagedAttribute;
 import org.jgroups.stack.Protocol;
 import org.jgroups.stack.ProtocolStack;
+import org.jgroups.util.NameCache;
 import org.jgroups.util.SocketFactory;
-import org.jgroups.util.UUID;
 import org.jgroups.util.Util;
 
 import java.io.Closeable;
@@ -312,7 +312,7 @@ public Object down(Event evt) {
     * @param member
     * @return The logical name for <code>member</code>
     */
-    public String getName(Address member) {return member != null? UUID.get(member) : null;}
+    public String getName(Address member) {return member != null? NameCache.get(member) : null;}
 
 
    /**

src/org/jgroups/Global.java

@@ -48,8 +48,8 @@ public final class Global {
     public static final String MAGIC_NUMBER_FILE="jgroups.conf.magic_number_file";
     public static final String PROTOCOL_ID_FILE="jgroups.conf.protocol_id_file";
     public static final String PRINT_UUIDS="jgroups.print_uuids";
-    public static final String UUID_CACHE_MAX_ELEMENTS="jgroups.uuid_cache.max_elements";
-    public static final String UUID_CACHE_MAX_AGE="jgroups.uuid_cache.max_age";
+    public static final String NAME_CACHE_MAX_ELEMENTS="jgroups.name_cache.max_elements";
+    public static final String NAME_CACHE_MAX_AGE="jgroups.name_cache.max_age";
 
     public static final String IPV6_MCAST_PREFIX="jgroups.ipmcast.prefix";
 

src/org/jgroups/JChannel.java

@@ -233,7 +233,7 @@ public JChannel setName(String name) {
                 throw new IllegalStateException("name cannot be set if channel is connected (should be done before)");
             this.name=name;
             if(local_addr != null)
-                UUID.add(local_addr, this.name);
+                NameCache.add(local_addr, this.name);
         }
         return this;
     }
@@ -759,7 +759,7 @@ public Object up(Event evt) {
                 if(tmp_addr != null) {
                     this.local_addr=tmp_addr;
                     if(name != null && !name.isEmpty())
-                        UUID.add(local_addr, name);
+                        NameCache.add(local_addr, name);
                 }
                 break;
 
@@ -1011,7 +1011,7 @@ protected JChannel setAddress() {
         if(name == null || name.isEmpty()) // generate a logical name if not set
             name=Util.generateLocalName();
         if(name != null && !name.isEmpty())
-            UUID.add(local_addr, name);
+            NameCache.add(local_addr, name);
 
         Event evt=new Event(Event.SET_LOCAL_ADDRESS, local_addr);
         down(evt);
@@ -1078,7 +1078,7 @@ protected JChannel _close(boolean disconnect) {
         notifyChannelClosed(this);
         init(); // sets local_addr=null; changed March 18 2003 (bela) -- prevented successful rejoining
         if(old_addr != null)
-            UUID.remove(old_addr);
+            NameCache.remove(old_addr);
         return this;
     }
 

src/org/jgroups/auth/RegexMembership.java

@@ -6,7 +6,7 @@
 import org.jgroups.Message;
 import org.jgroups.PhysicalAddress;
 import org.jgroups.annotations.Property;
-import org.jgroups.util.UUID;
+import org.jgroups.util.NameCache;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -71,7 +71,7 @@ public boolean authenticate(AuthToken token, Message msg) {
             }
         }
         if(match_logical_name) {
-            String logical_name=sender != null? UUID.get(sender) : null;
+            String logical_name=sender != null? NameCache.get(sender) : null;
             if(logical_name != null) {
                 Matcher matcher=pattern.matcher(logical_name);
                 boolean result=matcher.matches();

src/org/jgroups/protocols/Discovery.java

@@ -246,7 +246,7 @@ public void dumpCache(String output_filename) throws Exception {
         for(Map.Entry<Address,PhysicalAddress> entry: cache_contents.entrySet()) {
             Address         addr=entry.getKey();
             PhysicalAddress phys_addr=entry.getValue();
-            PingData data=new PingData(addr, true, UUID.get(addr), phys_addr).coord(addr.equals(local_addr));
+            PingData data=new PingData(addr, true, NameCache.get(addr), phys_addr).coord(addr.equals(local_addr));
             list.add(data);
         }
         OutputStream out=new FileOutputStream(output_filename);
@@ -303,7 +303,7 @@ public Object up(Message msg) {
                             // JGRP-1492: only return our own address, and addresses in view.
                             if(addr.equals(local_addr) || members.contains(addr)) {
                                 PhysicalAddress physical_addr=entry.getValue();
-                                sendDiscoveryResponse(addr, physical_addr, UUID.get(addr), msg.getSrc(), isCoord(addr));
+                                sendDiscoveryResponse(addr, physical_addr, NameCache.get(addr), msg.getSrc(), isCoord(addr));
                             }
                         }
                     }
@@ -315,7 +315,7 @@ public Object up(Message msg) {
                 boolean send_response=mbrs == null || mbrs.contains(local_addr);
                 if(send_response) {
                     PhysicalAddress physical_addr=(PhysicalAddress)down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
-                    sendDiscoveryResponse(local_addr, physical_addr, UUID.get(local_addr), msg.getSrc(), is_coord);
+                    sendDiscoveryResponse(local_addr, physical_addr, NameCache.get(local_addr), msg.getSrc(), is_coord);
                 }
                 return null;
 
@@ -510,7 +510,7 @@ protected boolean addDiscoveryResponseToCaches(Address mbr, String logical_name,
         if(mbr == null)
             return false;
         if(logical_name != null)
-            UUID.add(mbr, logical_name);
+            NameCache.add(mbr, logical_name);
         if(physical_addr != null)
             return (Boolean)down(new Event(Event.ADD_PHYSICAL_ADDRESS, new Tuple<>(mbr, physical_addr)));
         return false;
@@ -609,7 +609,7 @@ protected void disseminateDiscoveryInformation(List current_mbrs, List<Address>
                 continue;
             boolean is_coordinator=isCoord(addr);
             for(Address target : new_mbrs)
-                sendDiscoveryResponse(addr,phys_addr,UUID.get(addr),target,is_coordinator);
+                sendDiscoveryResponse(addr,phys_addr,NameCache.get(addr),target,is_coordinator);
         }
 
         // 2. Send information about new_mbrs to <everyone - self - left_mbrs - new_mbrs>
@@ -623,7 +623,7 @@ protected void disseminateDiscoveryInformation(List current_mbrs, List<Address>
                     continue;
                 boolean is_coordinator=isCoord(addr);
                 for(Address target : targets)
-                    sendDiscoveryResponse(addr,phys_addr,UUID.get(addr),target,is_coordinator);
+                    sendDiscoveryResponse(addr,phys_addr,NameCache.get(addr),target,is_coordinator);
             }
         }
     }

src/org/jgroups/protocols/FILE_PING.java

@@ -7,9 +7,9 @@
 import org.jgroups.annotations.ManagedAttribute;
 import org.jgroups.annotations.ManagedOperation;
 import org.jgroups.annotations.Property;
+import org.jgroups.util.NameCache;
 import org.jgroups.util.Responses;
 import org.jgroups.util.TimeScheduler;
-import org.jgroups.util.UUID;
 import org.jgroups.util.Util;
 
 import java.io.*;
@@ -111,7 +111,7 @@ public void findMembers(final List<Address> members, final boolean initial_disco
             readAll(members, cluster_name, responses);
             if(responses.isEmpty()) {
                 PhysicalAddress physical_addr=(PhysicalAddress)down(new Event(Event.GET_PHYSICAL_ADDRESS,local_addr));
-                PingData coord_data=new PingData(local_addr, true, UUID.get(local_addr), physical_addr).coord(is_coord);
+                PingData coord_data=new PingData(local_addr, true, NameCache.get(local_addr), physical_addr).coord(is_coord);
                 write(Collections.singletonList(coord_data), cluster_name);
                 return;
             }
@@ -126,7 +126,7 @@ public void findMembers(final List<Address> members, final boolean initial_disco
                     ; // use case #1 if we have predefined files: most members join but are not coord
             }
             else {
-                sendDiscoveryResponse(local_addr, phys_addr, UUID.get(local_addr), null, false);
+                sendDiscoveryResponse(local_addr, phys_addr, NameCache.get(local_addr), null, false);
             }
         }
         finally {
@@ -147,7 +147,7 @@ protected boolean addDiscoveryResponseToCaches(Address mbr, String logical_name,
     }
 
     protected static String addressToFilename(Address mbr) {
-        String logical_name=UUID.get(mbr);
+        String logical_name=NameCache.get(mbr);
         String name=(addressAsString(mbr) + (logical_name != null? "." + logical_name + SUFFIX : SUFFIX));
         return regexp.matcher(name).replaceAll("-");
     }
@@ -276,7 +276,7 @@ protected void writeAll() {
         for(Map.Entry<Address,PhysicalAddress> entry: cache_contents.entrySet()) {
             Address         addr=entry.getKey();
             PhysicalAddress phys_addr=entry.getValue();
-            PingData data=new PingData(addr, true, UUID.get(addr), phys_addr).coord(addr.equals(local_addr));
+            PingData data=new PingData(addr, true, NameCache.get(addr), phys_addr).coord(addr.equals(local_addr));
             list.add(data);
         }
         write(list, cluster_name);

src/org/jgroups/protocols/JDBC_PING.java

@@ -7,9 +7,9 @@
 import org.jgroups.annotations.ManagedAttribute;
 import org.jgroups.annotations.ManagedOperation;
 import org.jgroups.annotations.Property;
+import org.jgroups.util.NameCache;
 import org.jgroups.util.Responses;
 import org.jgroups.util.TimeScheduler;
-import org.jgroups.util.UUID;
 import org.jgroups.util.Util;
 
 import javax.naming.InitialContext;
@@ -189,7 +189,7 @@ else if(old_view != null && new_view != null) {
     /** Write my own UUID,logical name and physical address to a file */
     protected void writeOwnInformation(boolean overwrite) {
         PhysicalAddress physical_addr=(PhysicalAddress)down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
-        PingData data=new PingData(local_addr, is_server, UUID.get(local_addr), physical_addr).coord(is_coord);
+        PingData data=new PingData(local_addr, is_server, NameCache.get(local_addr), physical_addr).coord(is_coord);
         writeToDB(data, cluster_name, overwrite); // write my own data to file
     }
 

src/org/jgroups/protocols/MERGE3.java

@@ -314,13 +314,13 @@ protected View readView(byte[] buffer, int offset, int length) {
     protected MergeHeader createInfo() {
         PhysicalAddress physical_addr=local_addr != null?
           (PhysicalAddress)down_prot.down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr)) : null;
-        return MergeHeader.createInfo(view.getViewId(), UUID.get(local_addr), physical_addr);
+        return MergeHeader.createInfo(view.getViewId(), NameCache.get(local_addr), physical_addr);
     }
 
     /** Adds received INFO to views hashmap */
     protected void addInfo(Address sender, ViewId view_id, String logical_name, PhysicalAddress physical_addr) {
         if(logical_name != null && sender instanceof UUID)
-            UUID.add(sender, logical_name);
+            NameCache.add(sender, logical_name);
         if(physical_addr != null)
             down(new Event(Event.ADD_PHYSICAL_ADDRESS, new Tuple<>(sender, physical_addr)));
         synchronized(views) {

src/org/jgroups/protocols/PDC.java

@@ -154,8 +154,8 @@ protected synchronized void readCacheFromDisk() {
             else {
                 if(data != null && data.getLogicalAddr() != null && data.getPhysicalAddr() != null) {
                     cache.put(data.getLogicalAddr(), (PhysicalAddress)data.getPhysicalAddr());
-                    if(data.getLogicalName() != null && UUID.get(data.getLogicalAddr()) == null)
-                        UUID.add(data.getLogicalAddr(), data.getLogicalName());
+                    if(data.getLogicalName() != null && NameCache.get(data.getLogicalAddr()) == null)
+                        NameCache.add(data.getLogicalAddr(), data.getLogicalName());
                 }
             }
         }
@@ -186,7 +186,7 @@ protected synchronized void writeNodeToDisk(Address logical_addr, PhysicalAddres
         // this is because the writing can be very slow under some circumstances
         File tmpFile=null, destination=null;
         try {
-            tmpFile=writeToTempFile(root_dir, logical_addr, physical_addr, UUID.get(logical_addr));
+            tmpFile=writeToTempFile(root_dir, logical_addr, physical_addr, NameCache.get(logical_addr));
             if(tmpFile == null)
                 return;
 

src/org/jgroups/protocols/PING.java

@@ -4,8 +4,8 @@
 import org.jgroups.Event;
 import org.jgroups.Message;
 import org.jgroups.PhysicalAddress;
+import org.jgroups.util.NameCache;
 import org.jgroups.util.Responses;
-import org.jgroups.util.UUID;
 import org.jgroups.util.Util;
 
 import java.io.InterruptedIOException;
@@ -44,7 +44,7 @@ protected void sendDiscoveryRequest(String cluster_name, List<Address> members_t
         PhysicalAddress physical_addr=(PhysicalAddress)down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
 
         // https://issues.jboss.org/browse/JGRP-1670
-        PingData data=new PingData(local_addr, false, UUID.get(local_addr), physical_addr);
+        PingData data=new PingData(local_addr, false, NameCache.get(local_addr), physical_addr);
         PingHeader hdr=new PingHeader(PingHeader.GET_MBRS_REQ).clusterName(cluster_name);
 
         if(members_to_find != null && members_to_find.size() <= max_members_in_discovery_request)

src/org/jgroups/protocols/RELAY.java

@@ -8,7 +8,6 @@
 import org.jgroups.stack.IpAddress;
 import org.jgroups.stack.Protocol;
 import org.jgroups.util.*;
-import org.jgroups.util.UUID;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -300,7 +299,7 @@ protected Object installView(byte[] buf, int offset, int length) {
         try {
             ViewData data=Util.streamableFromByteBuffer(ViewData.class, buf, offset, length);
             if(data.uuids != null)
-                UUID.add(data.uuids);
+                NameCache.add(data.uuids);
 
             remote_view=data.remote_view;
             if(global_view == null || (data.global_view != null &&!global_view.equals(data.global_view))) {
@@ -703,7 +702,7 @@ private ViewData(View remote_view, View global_view, Map<Address,String> uuids)
         }
 
         public static ViewData create(View remote_view, View global_view) {
-            Map<Address,String> tmp=UUID.getContents();
+            Map<Address,String> tmp=NameCache.getContents();
             return new ViewData(remote_view, global_view, tmp);
         }
 

src/org/jgroups/protocols/SHARED_LOOPBACK.java

@@ -7,7 +7,7 @@
 import org.jgroups.annotations.ManagedAttribute;
 import org.jgroups.annotations.ManagedOperation;
 import org.jgroups.util.AsciiString;
-import org.jgroups.util.UUID;
+import org.jgroups.util.NameCache;
 import org.jgroups.util.Util;
 
 import java.util.*;
@@ -104,7 +104,7 @@ public static List<PingData> getDiscoveryResponsesFor(String cluster_name) {
             for(Map.Entry<Address,SHARED_LOOPBACK> entry: mbrs.entrySet()) {
                 Address addr=entry.getKey();
                 SHARED_LOOPBACK slp=entry.getValue();
-                PingData data=new PingData(addr, slp.isServer(), UUID.get(addr), null).coord(slp.isCoord());
+                PingData data=new PingData(addr, slp.isServer(), NameCache.get(addr), null).coord(slp.isCoord());
                 rsps.add(data);
             }
         }

src/org/jgroups/protocols/TCPGOSSIP.java

@@ -11,8 +11,8 @@
 import org.jgroups.stack.IpAddress;
 import org.jgroups.stack.RouterStub;
 import org.jgroups.stack.RouterStubManager;
+import org.jgroups.util.NameCache;
 import org.jgroups.util.Responses;
-import org.jgroups.util.UUID;
 import org.jgroups.util.Util;
 
 import java.net.InetAddress;
@@ -110,7 +110,7 @@ public void handleConnect() {
             log.trace("registering " + local_addr + " under " + cluster_name + " with GossipRouter");
             stubManager.destroyStubs();
             PhysicalAddress physical_addr = (PhysicalAddress) down_prot.down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
-            stubManager = new RouterStubManager(this,cluster_name, local_addr, UUID.get(local_addr), physical_addr, reconnect_interval).useNio(this.use_nio);
+            stubManager = new RouterStubManager(this, cluster_name, local_addr, NameCache.get(local_addr), physical_addr, reconnect_interval).useNio(this.use_nio);
             for (InetSocketAddress host : initial_hosts) {
                 RouterStub stub=stubManager.createAndRegisterStub(new IpAddress(bind_addr, 0), new IpAddress(host.getAddress(), host.getPort()));
                 stub.socketConnectionTimeout(sock_conn_timeout);
@@ -162,7 +162,7 @@ public void findMembers(List<Address> members, boolean initial_discovery, Respon
     @Override
     public void members(List<PingData> mbrs) {
         PhysicalAddress      own_physical_addr=(PhysicalAddress)down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
-        PingData             data=new PingData(local_addr, false, org.jgroups.util.UUID.get(local_addr), own_physical_addr);
+        PingData             data=new PingData(local_addr, false, org.jgroups.util.NameCache.get(local_addr), own_physical_addr);
         PingHeader           hdr=new PingHeader(PingHeader.GET_MBRS_REQ).clusterName(cluster_name);
 
         Set<PhysicalAddress> physical_addrs=mbrs.stream().filter(ping_data -> ping_data != null && ping_data.getPhysicalAddr() != null)

src/org/jgroups/protocols/TCPPING.java

@@ -128,7 +128,7 @@ public void findMembers(List<Address> members, boolean initial_discovery, Respon
         PhysicalAddress physical_addr=(PhysicalAddress)down(new Event(Event.GET_PHYSICAL_ADDRESS, local_addr));
 
         // https://issues.jboss.org/browse/JGRP-1670
-        PingData data=new PingData(local_addr, false, org.jgroups.util.UUID.get(local_addr), physical_addr);
+        PingData data=new PingData(local_addr, false, org.jgroups.util.NameCache.get(local_addr), physical_addr);
         PingHeader hdr=new PingHeader(PingHeader.GET_MBRS_REQ).clusterName(cluster_name);
 
         List<PhysicalAddress> cluster_members=new ArrayList<>(initial_hosts.size() + (dynamic_hosts != null? dynamic_hosts.size() : 0) + 5);