openejb-multicast: usage of dimaond operator
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/94540cda Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/94540cda Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/94540cda Branch: refs/heads/master Commit: 94540cdab5437ca7c7a5dee10ceb7ad8c50fd65e Parents: 5744022 Author: Hayri Cicek <[email protected]> Authored: Mon Dec 3 19:53:34 2018 +0100 Committer: Hayri Cicek <[email protected]> Committed: Mon Dec 3 19:53:34 2018 +0100 ---------------------------------------------------------------------- .../openejb/server/discovery/EchoNet.java | 2 +- .../discovery/MulticastDiscoveryAgent.java | 10 ++--- .../server/discovery/MulticastPulseAgent.java | 46 ++++++++++---------- .../discovery/MultipointDiscoveryAgent.java | 12 ++--- .../server/discovery/MultipointServer.java | 16 +++---- .../openejb/server/discovery/Tracker.java | 10 ++--- 6 files changed, 48 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/94540cda/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java ---------------------------------------------------------------------- diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java index 14be43c..b73abe9 100644 --- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java +++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/EchoNet.java @@ -74,7 +74,7 @@ public class EchoNet { public static class Calc { public static void main(String[] args) { - Set<Item> set = new HashSet<Item>(); + Set<Item> set = new HashSet<>(); int x = 150; http://git-wip-us.apache.org/repos/asf/tomee/blob/94540cda/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java ---------------------------------------------------------------------- diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java index 1f660f3..5db7c58 100644 --- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java +++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastDiscoveryAgent.java @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class MulticastDiscoveryAgent implements DiscoveryAgent, ServerService, SelfManaging { - private static final Logger log = Logger.getInstance(LogCategory.OPENEJB_SERVER.createChild("discovery").createChild("multicast"), MulticastDiscoveryAgent.class); + private static final Logger LOG = Logger.getInstance(LogCategory.OPENEJB_SERVER.createChild("discovery").createChild("multicast"), MulticastDiscoveryAgent.class); private final AtomicBoolean running = new AtomicBoolean(false); @@ -65,7 +65,7 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, ServerService, S public void init(final Properties props) { final Options options = new Options(props); - options.setLogger(new OptionsLog(log)); + options.setLogger(new OptionsLog(LOG)); host = props.getProperty("bind", host); loopbackMode = options.get("loopback_mode", loopbackMode); @@ -215,7 +215,7 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, ServerService, S // ignore } catch (IOException e) { if (running.get()) { - log.error("failed to process packet: " + e); + LOG.error("failed to process packet: " + e); } } } @@ -248,10 +248,10 @@ public class MulticastDiscoveryAgent implements DiscoveryAgent, ServerService, S if (failed == null) { failed = e; - log.error("Failed to advertise our service: " + uri, e); + LOG.error("Failed to advertise our service: " + uri, e); final String message = e.getMessage(); if (null != message && message.toLowerCase().contains("operation not permitted")) { - log.error("The 'Operation not permitted' error has been know to be caused by improper firewall/network setup. " + LOG.error("The 'Operation not permitted' error has been know to be caused by improper firewall/network setup. " + "Please make sure that the OS is properly configured to allow multicast traffic over: " + multicast.getLocalAddress()); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/94540cda/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java ---------------------------------------------------------------------- diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java index af30214..bcbf15c 100644 --- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java +++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MulticastPulseAgent.java @@ -62,7 +62,7 @@ import java.util.concurrent.locks.ReentrantLock; */ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfManaging { - private static final Logger log = Logger.getInstance(LogCategory.OPENEJB_SERVER.createChild("discovery").createChild("multipulse"), MulticastPulseAgent.class); + private static final Logger LOG = Logger.getInstance(LogCategory.OPENEJB_SERVER.createChild("discovery").createChild("multipulse"), MulticastPulseAgent.class); private static NetworkInterface[] interfaces = null; private static ExecutorService executor = null; private static final Charset UTF8 = Charset.forName("UTF-8"); @@ -74,10 +74,10 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM public static final String EMPTY = "NoService"; private final ReentrantLock lock = new ReentrantLock(); - private final Set<String> ignore = Collections.synchronizedSet(new HashSet<String>()); - private final Set<URI> uriSet = new HashSet<URI>(); + private final Set<String> ignore = Collections.synchronizedSet(new HashSet<>()); + private final Set<URI> uriSet = new HashSet<>(); private final AtomicBoolean running = new AtomicBoolean(false); - final ArrayList<Future> futures = new ArrayList<Future>(); + final ArrayList<Future> futures = new ArrayList<>(); private MulticastSocket[] sockets = null; private InetSocketAddress address = null; @@ -131,7 +131,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM @Override public void init(final Properties p) throws Exception { final Options o = new Options(p); - o.setLogger(new OptionsLog(log)); + o.setLogger(new OptionsLog(LOG)); this.ignore.add("localhost"); this.ignore.add("::1"); @@ -145,7 +145,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM } } } catch (final Exception e) { - log.warning("Invalid ignore parameter. Should be a lowercase single host or comma seperated list of hosts to ignore like: ignore=host1,host2,ipv4,ipv6"); + LOG.warning("Invalid ignore parameter. Should be a lowercase single host or comma seperated list of hosts to ignore like: ignore=host1,host2,ipv4,ipv6"); } this.multicast = o.get("bind", this.multicast); @@ -191,12 +191,12 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM final byte[] bytes = (sb.toString()).getBytes(UTF8); this.response = new DatagramPacket(bytes, bytes.length, this.address); - if (log.isDebugEnabled()) { - log.debug("MultiPulse packet is: " + sb); + if (LOG.isDebugEnabled()) { + LOG.debug("MultiPulse packet is: " + sb); } if (bytes.length > 2048) { - log.warning("MultiPulse packet is larger than 2048 bytes, clients will not be able to read the packet" + + LOG.warning("MultiPulse packet is larger than 2048 bytes, clients will not be able to read the packet" + "\n - You should define the 'ignore' property to filter out unreachable addresses: " + sb); } } finally { @@ -298,7 +298,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM try { socketKey = socket.getNetworkInterface().toString(); } catch (final SocketException e) { - log.error("Failed to get network interface name on: " + socket, e); + LOG.error("Failed to get network interface name on: " + socket, e); continue; } @@ -348,7 +348,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM //Remove it and rebuild our broadcast packet if (agent.ignore.add(badUri)) { agent.buildPacket(); - log.warning("This server has removed the unreachable host '" + badUri + "' from discovery, you should consider adding" + + LOG.warning("This server has removed the unreachable host '" + badUri + "' from discovery, you should consider adding" + " this to the 'ignore' property in the multipulse.properties file"); } } finally { @@ -365,16 +365,16 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM if (isLoopBackOnly && !MulticastPulseAgent.isLocalAddress(client, false)) { //We only have local services, so make sure the request is from a local source else ignore it - if (log.isDebugEnabled()) { - log.debug(String.format("Ignoring remote client %1$s pulse request for group: %2$s - No remote services available", + if (LOG.isDebugEnabled()) { + LOG.debug(String.format("Ignoring remote client %1$s pulse request for group: %2$s - No remote services available", client, req)); } } else { //We have received a valid pulse request - if (log.isDebugEnabled()) { - log.debug(String.format("Answering client '%1$s' pulse request for group: '%2$s' on '%3$s'", client, req, socketKey)); + if (LOG.isDebugEnabled()) { + LOG.debug(String.format("Answering client '%1$s' pulse request for group: '%2$s' on '%3$s'", client, req, socketKey)); } //Renew response pulse @@ -386,8 +386,8 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM } } catch (final Exception e) { - if (log.isDebugEnabled()) { - log.debug("MulticastPulseAgent request error: " + e.getMessage(), e); + if (LOG.isDebugEnabled()) { + LOG.debug("MulticastPulseAgent request error: " + e.getMessage(), e); } } } @@ -526,7 +526,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM private static MulticastSocket[] getSockets(final InetAddress ia, final int port) throws Exception { - final ArrayList<MulticastSocket> list = new ArrayList<MulticastSocket>(); + final ArrayList<MulticastSocket> list = new ArrayList<>(); for (final NetworkInterface ni : getInterfaces()) { @@ -545,7 +545,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM list.add(ms); - log.debug(String.format("Created MulticastSocket for '%1$s:%2$s' on network adapter: %3$s", ia.getHostName(), port, ni)); + LOG.debug(String.format("Created MulticastSocket for '%1$s:%2$s' on network adapter: %3$s", ia.getHostName(), port, ni)); } catch (final Throwable e) { @@ -564,7 +564,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM private static NetworkInterface[] getNetworkInterfaces() { - final HashSet<NetworkInterface> list = new HashSet<NetworkInterface>(); + final HashSet<NetworkInterface> list = new HashSet<>(); try { final Enumeration<NetworkInterface> interfaces = NetworkInterface.getNetworkInterfaces(); @@ -692,7 +692,7 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM } } } catch (final UnknownHostException e) { - log.warning("Failed to list machine hosts", e); + LOG.warning("Failed to list machine hosts", e); } final StringBuilder sb = new StringBuilder(); @@ -743,8 +743,8 @@ public class MulticastPulseAgent implements DiscoveryAgent, ServerService, SelfM try { this.socket.send(this.agent.getResponsePacket()); } catch (final Exception e) { - if (log.isDebugEnabled()) { - log.debug("MulticastPulseAgent client error: " + e.getMessage(), e); + if (LOG.isDebugEnabled()) { + LOG.debug("MulticastPulseAgent client error: " + e.getMessage(), e); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/94540cda/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java ---------------------------------------------------------------------- diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java index 9ff9318..f2f3e3f 100644 --- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java +++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgent.java @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicBoolean; */ public class MultipointDiscoveryAgent implements DiscoveryAgent, ServerService, SelfManaging { - private static final Logger log = Logger.getInstance(LogCategory.OPENEJB_SERVER.createChild("discovery").createChild("multipoint"), MultipointDiscoveryAgent.class); + private static final Logger LOG = Logger.getInstance(LogCategory.OPENEJB_SERVER.createChild("discovery").createChild("multipoint"), MultipointDiscoveryAgent.class); private final AtomicBoolean running = new AtomicBoolean(false); @@ -86,7 +86,7 @@ public class MultipointDiscoveryAgent implements DiscoveryAgent, ServerService, public void init(final Properties props) { final Options options = new Options(props); - options.setLogger(new OptionsLog(log)); + options.setLogger(new OptionsLog(LOG)); host = props.getProperty("bind", host); port = options.get("port", port); @@ -96,7 +96,7 @@ public class MultipointDiscoveryAgent implements DiscoveryAgent, ServerService, name = name != null ? name : options.get("discoveryName", MultipointServer.randomColor()); reconnectDelay = options.get("reconnectDelay", new Duration("30 seconds")); - final Set<URI> uris = new LinkedHashSet<URI>(); + final Set<URI> uris = new LinkedHashSet<>(); // Connect the initial set of peer servers final StringTokenizer st = new StringTokenizer(initialServers, ","); @@ -178,9 +178,9 @@ public class MultipointDiscoveryAgent implements DiscoveryAgent, ServerService, public void start() throws ServiceException { try { if (running.compareAndSet(false, true)) { - log.info("MultipointDiscoveryAgent Starting"); + LOG.info("MultipointDiscoveryAgent Starting"); multipointServer = new MultipointServer(host, discoveryHost, port, tracker, name, debug, roots, reconnectDelay).start(); - log.info("MultipointDiscoveryAgent Started"); + LOG.info("MultipointDiscoveryAgent Started"); this.port = multipointServer.getPort(); @@ -206,7 +206,7 @@ public class MultipointDiscoveryAgent implements DiscoveryAgent, ServerService, @Managed public void stop() throws ServiceException { if (running.compareAndSet(true, false)) { - log.info("MultipointDiscoveryAgent Stopping"); + LOG.info("MultipointDiscoveryAgent Stopping"); multipointServer.stop(); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/94540cda/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java ---------------------------------------------------------------------- diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java index 1e74436..16da60c 100644 --- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java +++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/MultipointServer.java @@ -79,7 +79,7 @@ public class MultipointServer { private final URI me; - private final Set<URI> roots = new LinkedHashSet<URI>(); + private final Set<URI> roots = new LinkedHashSet<>(); private final Event runs = new Event(); @@ -95,8 +95,8 @@ public class MultipointServer { private final Tracker tracker; - private final LinkedList<Host> connect = new LinkedList<Host>(); - private final Map<URI, Session> connections = new HashMap<URI, Session>(); + private final LinkedList<Host> connect = new LinkedList<>(); + private final Map<URI, Session> connections = new HashMap<>(); private long joined = 0; @@ -205,12 +205,12 @@ public class MultipointServer { } public List<URI> getSessions() { - return new ArrayList<URI>(connections.keySet()); + return new ArrayList<>(connections.keySet()); } public List<URI> getConnectionsQueued() { synchronized (connect) { - final ArrayList<URI> uris = new ArrayList<URI>(connect.size()); + final ArrayList<URI> uris = new ArrayList<>(connect.size()); for (final Host host : connect) { uris.add(host.getUri()); } @@ -322,7 +322,7 @@ public class MultipointServer { private final SocketChannel channel; private final ByteBuffer read = ByteBuffer.allocate(1024); private final SelectionKey key; - private final List<URI> listed = new ArrayList<URI>(); + private final List<URI> listed = new ArrayList<>(); private final long created = System.currentTimeMillis(); private ByteBuffer write; @@ -621,7 +621,7 @@ public class MultipointServer { private void initiateConnections() { synchronized (connect) { - final LinkedList<Host> unresolved = new LinkedList<Host>(); + final LinkedList<Host> unresolved = new LinkedList<>(); while (connect.size() > 0) { @@ -918,7 +918,7 @@ public class MultipointServer { private ArrayList<URI> connections() { synchronized (connect) { - final ArrayList<URI> list = new ArrayList<URI>(connections.keySet()); + final ArrayList<URI> list = new ArrayList<>(connections.keySet()); for (final Host host : connect) { list.add(host.getUri()); } http://git-wip-us.apache.org/repos/asf/tomee/blob/94540cda/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java ---------------------------------------------------------------------- diff --git a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java index 335af66..6c2b816 100644 --- a/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java +++ b/server/openejb-multicast/src/main/java/org/apache/openejb/server/discovery/Tracker.java @@ -75,9 +75,9 @@ public class Tracker { this.log.info("Created " + this); } - private final Map<String, Service> registeredServices = new ConcurrentHashMap<String, Service>(); + private final Map<String, Service> registeredServices = new ConcurrentHashMap<>(); - private final Map<String, ServiceVitals> discoveredServices = new ConcurrentHashMap<String, ServiceVitals>(); + private final Map<String, ServiceVitals> discoveredServices = new ConcurrentHashMap<>(); private DiscoveryListener discoveryListener; public long getHeartRate() { @@ -98,12 +98,12 @@ public class Tracker { @Managed public Set<String> getServicesRegistered() { - return new HashSet<String>(registeredServices.keySet()); + return new HashSet<>(registeredServices.keySet()); } @Managed public Set<String> getServicesDiscovered() { - return new HashSet<String>(discoveredServices.keySet()); + return new HashSet<>(discoveredServices.keySet()); } public void registerService(final URI serviceUri) throws IOException { @@ -187,7 +187,7 @@ public class Tracker { return debug && log.isDebugEnabled(); } - private final Executor executor = new ThreadPoolExecutor(1, 2, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(1), new ThreadFactory() { + private final Executor executor = new ThreadPoolExecutor(1, 2, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<>(1), new ThreadFactory() { @Override public Thread newThread(final Runnable runable) { final Thread t = new Thread(runable, "Discovery Agent Notifier");
