usage of diamonoperator, remove of unussed imports and naming convention
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f228013d Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f228013d Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f228013d Branch: refs/heads/master Commit: f228013d3f2772e8e70ecc242aa93d48652afadd Parents: 3372bcd Author: Hayri Cicek <[email protected]> Authored: Mon Dec 3 19:30:06 2018 +0100 Committer: Hayri Cicek <[email protected]> Committed: Mon Dec 3 19:30:06 2018 +0100 ---------------------------------------------------------------------- .../org/apache/openejb/server/DiscoveryAgent.java | 6 ++++-- .../apache/openejb/server/DiscoveryListener.java | 1 - .../apache/openejb/server/DiscoveryRegistry.java | 14 +++++++------- .../openejb/server/FilteredServiceManager.java | 2 +- .../main/java/org/apache/openejb/server/Main.java | 1 - .../openejb/server/ServiceAccessController.java | 4 ++-- .../org/apache/openejb/server/ServiceDaemon.java | 18 ++++++++++-------- .../org/apache/openejb/server/ServiceManager.java | 2 +- .../java/org/apache/openejb/server/Start.java | 2 +- 9 files changed, 26 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java index 734d87b..6aa04d2 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryAgent.java @@ -34,7 +34,7 @@ public interface DiscoveryAgent { * register a service * * @param serviceUri - * @param details + * @throws java.io.IOException */ void registerService(URI serviceUri) throws IOException; @@ -42,7 +42,7 @@ public interface DiscoveryAgent { * register a service * * @param serviceUri - * @param details + * @throws java.io.IOException */ void unregisterService(URI serviceUri) throws IOException; @@ -50,6 +50,8 @@ public interface DiscoveryAgent { * A process actively using a service may see it go down before the DiscoveryAgent notices the * service's failure. That process can use this method to notify the DiscoveryAgent of the failure * so that other listeners of this DiscoveryAgent can also be made aware of the failure. + * @param serviceUri + * @throws java.io.IOException */ void reportFailed(URI serviceUri) throws IOException; http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java index 3470fbd..3a042fe 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryListener.java @@ -18,7 +18,6 @@ package org.apache.openejb.server; import java.net.URI; -import java.io.IOException; /** * @version $Rev$ $Date$ http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryRegistry.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryRegistry.java b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryRegistry.java index 247fe08..6b47711 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryRegistry.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/DiscoveryRegistry.java @@ -29,10 +29,10 @@ import java.util.concurrent.*; */ public class DiscoveryRegistry implements DiscoveryListener, DiscoveryAgent { - private final List<DiscoveryAgent> agents = new CopyOnWriteArrayList<DiscoveryAgent>(); - private final List<DiscoveryListener> listeners = new CopyOnWriteArrayList<DiscoveryListener>(); - private final Map<String, URI> services = new ConcurrentHashMap<String, URI>(); - private final Map<String, URI> registered = new ConcurrentHashMap<String, URI>(); + private final List<DiscoveryAgent> agents = new CopyOnWriteArrayList<>(); + private final List<DiscoveryListener> listeners = new CopyOnWriteArrayList<>(); + private final Map<String, URI> services = new ConcurrentHashMap<>(); + private final Map<String, URI> registered = new ConcurrentHashMap<>(); @Managed private final Monitor monitor = new Monitor(); @@ -45,7 +45,7 @@ public class DiscoveryRegistry implements DiscoveryListener, DiscoveryAgent { public DiscoveryRegistry(final DiscoveryAgent agent) { - executor = new ThreadPoolExecutor(1, 10, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(1), new ThreadFactory() { + executor = new ThreadPoolExecutor(1, 10, 30, TimeUnit.SECONDS, new LinkedBlockingQueue<>(1), new ThreadFactory() { @Override public Thread newThread(final Runnable runable) { final Thread t = new Thread(runable, DiscoveryRegistry.class.getSimpleName()); @@ -90,7 +90,7 @@ public class DiscoveryRegistry implements DiscoveryListener, DiscoveryAgent { } public Set<URI> getServices() { - return new HashSet<URI>(services.values()); + return new HashSet<>(services.values()); } @Override @@ -211,7 +211,7 @@ public class DiscoveryRegistry implements DiscoveryListener, DiscoveryAgent { @Managed public String[] getAgents() { - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); for (final DiscoveryAgent agent : DiscoveryRegistry.this.agents) { list.add(agent.getClass().getName()); } http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java b/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java index cbee1ed..08b03e1 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/FilteredServiceManager.java @@ -36,7 +36,7 @@ public class FilteredServiceManager extends SimpleServiceManager { } private Collection<String> convertServices(final String[] services) { - final Set<String> realServices = new HashSet<String>(); + final Set<String> realServices = new HashSet<>(); final Collection<String> rsAliases = Arrays.asList("rest", "jaxrs", "jax-rs", "cxf-rs"); final Collection<String> wsAliases = Arrays.asList("jaxws", "jax-ws", "cxf"); http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java b/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java index de520ab..1032d3c 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/Main.java @@ -17,7 +17,6 @@ package org.apache.openejb.server; import java.io.File; -import java.io.IOException; import java.util.Properties; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java index da6e0d7..cd7d0df 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceAccessController.java @@ -80,7 +80,7 @@ public class ServiceAccessController extends ServerServiceFilter implements Unwr } private void parseAdminIPs(final Properties props) throws ServiceException { - final LinkedList<IPAddressPermission> permissions = new LinkedList<IPAddressPermission>(); + final LinkedList<IPAddressPermission> permissions = new LinkedList<>(); final String ipString = props.getProperty("only_from"); @@ -136,7 +136,7 @@ public class ServiceAccessController extends ServerServiceFilter implements Unwr @Managed public List<String> getHostPermissions() { - final List<String> list = new ArrayList<String>(); + final List<String> list = new ArrayList<>(); for (final IPAddressPermission hostPermission : hostPermissions) { list.add(hostPermission.toString()); } http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java index 4d50421..9a0033d 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceDaemon.java @@ -51,7 +51,7 @@ import java.util.concurrent.locks.ReentrantLock; @Managed public class ServiceDaemon extends UnwrappbleServerService { - private static final Logger log = Logger.getInstance(LogCategory.OPENEJB_SERVER, ServiceDaemon.class); + private static final Logger LOG = Logger.getInstance(LogCategory.OPENEJB_SERVER, ServiceDaemon.class); @Managed private final ServerService next; @@ -96,6 +96,7 @@ public class ServiceDaemon extends UnwrappbleServerService { /** * Gets the inetAddress number that the * daemon is listening on. + * @return */ public InetAddress getInetAddress() { return this.inetAddress; @@ -181,7 +182,7 @@ public class ServiceDaemon extends UnwrappbleServerService { final DiscoveryAgent agent = SystemInstance.get().getComponent(DiscoveryAgent.class); if (agent != null && this.discoveryUriFormat != null) { - final Map<String, String> map = new HashMap<String, String>(); + final Map<String, String> map = new HashMap<>(); // add all the properties that were used to construct this service for (final Map.Entry<Object, Object> entry : this.props.entrySet()) { @@ -196,7 +197,7 @@ public class ServiceDaemon extends UnwrappbleServerService { try { address = InetAddress.getLocalHost().getHostAddress(); } catch (UnknownHostException e) { - log.error("Failed to resolve 0.0.0.0 to a routable address", e); + LOG.error("Failed to resolve 0.0.0.0 to a routable address", e); } } @@ -207,7 +208,7 @@ public class ServiceDaemon extends UnwrappbleServerService { this.serviceUri = new URI(uriString); agent.registerService(this.serviceUri); } catch (Exception e) { - log.error("Cannot register service '" + this.getName() + "' with DiscoveryAgent.", e); + LOG.error("Cannot register service '" + this.getName() + "' with DiscoveryAgent.", e); } } @@ -224,7 +225,7 @@ public class ServiceDaemon extends UnwrappbleServerService { try { agent.unregisterService(this.serviceUri); } catch (IOException e) { - log.error("Cannot unregister service '" + this.getName() + "' with DiscoveryAgent.", e); + LOG.error("Cannot unregister service '" + this.getName() + "' with DiscoveryAgent.", e); } } this.next.stop(); @@ -243,6 +244,7 @@ public class ServiceDaemon extends UnwrappbleServerService { /** * Gets the port number that the * daemon is listening on. + * @return */ @Override @Managed @@ -340,11 +342,11 @@ public class ServiceDaemon extends UnwrappbleServerService { // Ignore - Should not get here on serverSocket.setSoTimeout(0) } catch (SocketException e) { if (!this.stop.get()) { - log.debug("Socket error", e); + LOG.debug("Socket error", e); } } catch (Throwable e) { if (!this.stop.get()) { - log.debug("Unexpected error", e); + LOG.debug("Unexpected error", e); } } } @@ -352,7 +354,7 @@ public class ServiceDaemon extends UnwrappbleServerService { try { this.serverSocket.close(); } catch (Throwable e) { - log.debug("Error cleaning up socked", e); + LOG.debug("Error cleaning up socked", e); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java index a6071d0..6496bca 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/ServiceManager.java @@ -80,7 +80,7 @@ public abstract class ServiceManager { protected List<ServerService> initServers(final Map<String, Properties> availableServices) throws IOException { - final List<ServerService> enabledServers = new ArrayList<ServerService>(); + final List<ServerService> enabledServers = new ArrayList<>(); for (final Map.Entry<String, Properties> serviceInfo : availableServices.entrySet()) { final String serviceName = serviceInfo.getKey(); http://git-wip-us.apache.org/repos/asf/tomee/blob/f228013d/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java ---------------------------------------------------------------------- diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java b/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java index 912c7cb..7d52d41 100644 --- a/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java +++ b/server/openejb-server/src/main/java/org/apache/openejb/server/Start.java @@ -65,7 +65,7 @@ public class Start { try { - final ArrayList<String> cmd = new ArrayList<String>(); + final ArrayList<String> cmd = new ArrayList<>(); final String s = java.io.File.separator;
