use diamond operator and remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e6226683 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e6226683 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e6226683 Branch: refs/heads/master Commit: e6226683c252a32653dbafa091a7857946087b45 Parents: 94540cd Author: Hayri Cicek <[email protected]> Authored: Mon Dec 3 20:22:21 2018 +0100 Committer: Hayri Cicek <[email protected]> Committed: Mon Dec 3 20:22:21 2018 +0100 ---------------------------------------------------------------------- .../openejb/server/ejbd/AuthRequestHandler.java | 14 ++++---- .../apache/openejb/server/ejbd/CallContext.java | 10 +++--- .../server/ejbd/ClientObjectFactory.java | 6 ++-- .../apache/openejb/server/ejbd/EjbDaemon.java | 28 +++++++-------- .../openejb/server/ejbd/EjbRequestHandler.java | 38 ++++++++++---------- .../openejb/server/ejbd/JndiRequestHandler.java | 22 ++++++------ .../openejb/server/ejbd/KeepAliveServer.java | 14 ++++++-- .../server/ejbd/LogoutRequestHandler.java | 15 ++++---- .../openejb/server/ejbd/ServerSideResolver.java | 4 +-- 9 files changed, 80 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java index 8336f2c..4abfabf 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/AuthRequestHandler.java @@ -31,8 +31,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; class AuthRequestHandler extends RequestHandler { - private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("auth"), "org.apache.openejb.server.util.resources"); - private static final boolean debug = logger.isDebugEnabled(); + private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("auth"), "org.apache.openejb.server.util.resources"); + private static final boolean DEBUG = LOGGER.isDebugEnabled(); protected AuthRequestHandler(final EjbDaemon daemon) { super(daemon); @@ -45,7 +45,7 @@ class AuthRequestHandler extends RequestHandler { @Override public Logger getLogger() { - return logger; + return LOGGER; } @Override @@ -77,9 +77,9 @@ class AuthRequestHandler extends RequestHandler { res.setResponseCode(ResponseCodes.AUTH_DENIED); res.setDeniedCause(t); } finally { - if (debug) { + if (DEBUG) { try { - logger.debug("AUTH REQUEST: " + req + " -- RESPONSE: " + res); + LOGGER.debug("AUTH REQUEST: " + req + " -- RESPONSE: " + res); } catch (Exception e) { //Ignore } @@ -100,10 +100,10 @@ class AuthRequestHandler extends RequestHandler { try { res.writeExternal(out); } catch (Exception e) { - logger.fatal("Could not write AuthenticationResponse to output stream", e); + LOGGER.fatal("Could not write AuthenticationResponse to output stream", e); } } else { - logger.error("AuthRequestHandler cannot process an instance of: " + response.getClass().getName()); + LOGGER.error("AuthRequestHandler cannot process an instance of: " + response.getClass().getName()); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java index f39283b..1841cf5 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/CallContext.java @@ -25,7 +25,7 @@ import java.util.HashMap; @SuppressWarnings("unchecked") public class CallContext { - private static final ThreadLocal<CallContext> threads = new ThreadLocal<CallContext>(); + private static final ThreadLocal<CallContext> THREADS = new ThreadLocal<CallContext>(); private final HashMap data = new HashMap(); public CallContext() { @@ -69,20 +69,20 @@ public class CallContext { public static void setCallContext(CallContext ctx) { if (ctx == null) { - ctx = threads.get(); + ctx = THREADS.get(); if (ctx != null) { ctx.reset(); } } else { - threads.set(ctx); + THREADS.set(ctx); } } public static CallContext getCallContext() { - CallContext ctx = threads.get(); + CallContext ctx = THREADS.get(); if (ctx == null) { ctx = new CallContext(); - threads.set(ctx); + THREADS.set(ctx); } return ctx; http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java index a1c4b74..9c76cdc 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ClientObjectFactory.java @@ -33,7 +33,7 @@ import java.util.Properties; class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer { - public static final ThreadLocal<ServerMetaData> serverMetaData = new ThreadLocal<ServerMetaData>(); + public static final ThreadLocal<ServerMetaData> SERVER_META_DATA = new ThreadLocal<ServerMetaData>(); protected ServerMetaData defaultServerMetaData; @@ -44,7 +44,7 @@ class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer { uriString = (props.getProperty("openejb.ejbd.uri", uriString)); this.defaultServerMetaData = new ServerMetaData(new URI(uriString)); } catch (Exception e) { - EjbDaemon.logger.error("Failed to read 'openejb.ejbd.uri': " + uriString, e); + EjbDaemon.LOGGER.error("Failed to read 'openejb.ejbd.uri': " + uriString, e); } } @@ -81,7 +81,7 @@ class ClientObjectFactory implements org.apache.openejb.spi.ApplicationServer { } private ServerMetaData getServerMetaData() { - ServerMetaData serverMetaData = ClientObjectFactory.serverMetaData.get(); + ServerMetaData serverMetaData = ClientObjectFactory.SERVER_META_DATA.get(); if (serverMetaData == null) { serverMetaData = defaultServerMetaData; } http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java index c26cd3f..dd3f9d5 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbDaemon.java @@ -54,7 +54,7 @@ import java.util.zip.GZIPInputStream; public class EjbDaemon implements org.apache.openejb.spi.ApplicationServer { - static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE, "org.apache.openejb.server.util.resources"); + static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE, "org.apache.openejb.server.util.resources"); private ClientObjectFactory clientObjectFactory; // DeploymentIndex deploymentIndex; @@ -194,7 +194,7 @@ public class EjbDaemon implements org.apache.openejb.spi.ApplicationServer { // Read ServerMetaData final ServerMetaData serverMetaData = new ServerMetaData(); serverMetaData.readExternal(ois); - ClientObjectFactory.serverMetaData.set(serverMetaData); + ClientObjectFactory.SERVER_META_DATA.set(serverMetaData); // Read request type requestTypeByte = ois.readByte(); @@ -256,7 +256,7 @@ public class EjbDaemon implements org.apache.openejb.spi.ApplicationServer { response = processLogoutRequest(ois, clientProtocol); break; default: - logger.error("\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Unknown request type " + requestType); + LOGGER.error("\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Unknown request type " + requestType); return; } @@ -289,34 +289,34 @@ public class EjbDaemon implements org.apache.openejb.spi.ApplicationServer { break; default: //Should never get here... - logger.error("\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Unknown response type " + requestType); + LOGGER.error("\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Unknown response type " + requestType); } } } catch (IllegalArgumentException iae) { final String msg = "\"" + clientProtocol.getSpec() + "\" FAIL \"Unknown request type " + requestTypeByte; - if (logger.isDebugEnabled()) { - logger.debug(msg, iae); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(msg, iae); } else { - logger.warning(msg + " - Debug for StackTrace"); + LOGGER.warning(msg + " - Debug for StackTrace"); } } catch (SecurityException e) { final String msg = "\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Security error - " + e.getMessage() + "\""; - if (logger.isDebugEnabled()) { - logger.debug(msg, e); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(msg, e); } else { - logger.warning(msg + " - Debug for StackTrace"); + LOGGER.warning(msg + " - Debug for StackTrace"); } } catch (Throwable e) { final String msg = "\"" + requestType + " " + clientProtocol.getSpec() + "\" FAIL \"Unexpected error - " + e.getMessage() + "\""; - if (logger.isDebugEnabled()) { - logger.debug(msg, e); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug(msg, e); } else { - logger.warning(msg + " - Debug for StackTrace"); + LOGGER.warning(msg + " - Debug for StackTrace"); } } finally { try { - ClientObjectFactory.serverMetaData.remove(); + ClientObjectFactory.SERVER_META_DATA.remove(); } finally { if (null != oos) { http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java index b7b7c3a..d753b11 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/EjbRequestHandler.java @@ -52,11 +52,11 @@ class EjbRequestHandler extends RequestHandler { public static final ServerSideResolver SERVER_SIDE_RESOLVER = new ServerSideResolver(); - private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("ejb"), "org.apache.openejb.server.util.resources"); + private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("ejb"), "org.apache.openejb.server.util.resources"); private final ClusterableRequestHandler clusterableRequestHandler; - private final Map<String, AtomicBoolean> asynchronousInvocationCancelMap = new ConcurrentHashMap<String, AtomicBoolean>(); + private final Map<String, AtomicBoolean> asynchronousInvocationCancelMap = new ConcurrentHashMap<>(); protected EjbRequestHandler(final EjbDaemon daemon) { super(daemon); @@ -69,7 +69,7 @@ class EjbRequestHandler extends RequestHandler { @Override public Logger getLogger() { - return logger; + return LOGGER; } @Override @@ -259,7 +259,7 @@ class EjbRequestHandler extends RequestHandler { res.setResponse(version, ResponseCodes.EJB_APP_EXCEPTION, new ThrowableArtifact(e.getRootCause())); } catch (org.apache.openejb.SystemException e) { res.setResponse(version, ResponseCodes.EJB_ERROR, new ThrowableArtifact(e.getRootCause())); - logger.error("System error in container for request: " + req, e); + LOGGER.error("System error in container for request: " + req, e); } catch (Throwable t) { return setResponseError(res, version, t, "Unknown error in container"); @@ -280,10 +280,10 @@ class EjbRequestHandler extends RequestHandler { //Ignore } - if (logger.isDebugEnabled()) { + if (LOGGER.isDebugEnabled()) { //The req and res toString overrides are volatile try { - logger.debug("EJB REQUEST: " + req + " -- RESPONSE: " + res); + LOGGER.debug("EJB REQUEST: " + req + " -- RESPONSE: " + res); } catch (Throwable t) { //Ignore } @@ -303,16 +303,16 @@ class EjbRequestHandler extends RequestHandler { res.setMetaData(metaData); res.writeExternal(out); } catch (Throwable t) { - if (logger.isDebugEnabled()) { - logger.debug("Failed to write EjbResponse", t); - } else if (logger.isInfoEnabled()) { - logger.info("Failed to write EjbResponse - Debug for stacktrace: " + t); + if (LOGGER.isDebugEnabled()) { + LOGGER.debug("Failed to write EjbResponse", t); + } else if (LOGGER.isInfoEnabled()) { + LOGGER.info("Failed to write EjbResponse - Debug for stacktrace: " + t); } } finally { try { SystemInstance.get().getComponent(SecurityService.class).disassociate(); } catch (Throwable t) { - logger.warning("Failed to disassociate security", t); + LOGGER.warning("Failed to disassociate security", t); } final CallContext call = CallContext.getCallContext(); @@ -324,7 +324,7 @@ class EjbRequestHandler extends RequestHandler { EJBObjectProxyHandle.resolver.set(null); } } else { - logger.error("EjbRequestHandler cannot process an instance of: " + response.getClass().getName()); + LOGGER.error("EjbRequestHandler cannot process an instance of: " + response.getClass().getName()); } } @@ -433,7 +433,7 @@ class EjbRequestHandler extends RequestHandler { } else { result = new RemoteException("The bean is not EJB compliant. The bean should be created or and exception should be thrown."); - logger.error(req + "The bean is not EJB compliant. The bean should be created or and exception should be thrown."); + LOGGER.error(req + "The bean is not EJB compliant. The bean should be created or and exception should be thrown."); res.setResponse(req.getVersion(), ResponseCodes.EJB_SYS_EXCEPTION, new ThrowableArtifact((Throwable) result)); } } @@ -471,7 +471,7 @@ class EjbRequestHandler extends RequestHandler { } else if (result instanceof java.util.Enumeration) { final java.util.Enumeration resultAsEnum = (java.util.Enumeration) result; - final java.util.List<Object> listOfPKs = new ArrayList<Object>(); + final java.util.List<Object> listOfPKs = new ArrayList<>(); while (resultAsEnum.hasMoreElements()) { final ProxyInfo proxyInfo = ((ProxyInfo) resultAsEnum.nextElement()); if (proxyInfo == null) { @@ -496,7 +496,7 @@ class EjbRequestHandler extends RequestHandler { "to return neither Collection nor the Remote Interface, " + "but [" + result.getClass().getName() + "]"; result = new RemoteException(message); - logger.error(req + " " + message); + LOGGER.error(req + " " + message); res.setResponse(req.getVersion(), ResponseCodes.EJB_SYS_EXCEPTION, result); } } @@ -583,10 +583,10 @@ class EjbRequestHandler extends RequestHandler { private EJBResponse setResponseError(final EJBResponse res, final byte version, final Throwable error, final String message) { //This is fatal for the client, but not the server. - if (logger.isInfoEnabled()) { - logger.info(message + " - Enable DEBUG for stacktrace: " + error); - } else if (logger.isDebugEnabled()) { - logger.debug(message, error); + if (LOGGER.isInfoEnabled()) { + LOGGER.info(message + " - Enable DEBUG for stacktrace: " + error); + } else if (LOGGER.isDebugEnabled()) { + LOGGER.debug(message, error); } final RemoteException re = new RemoteException(message, error); http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java index bfb7ccf..327b5ea 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/JndiRequestHandler.java @@ -93,7 +93,7 @@ class JndiRequestHandler extends RequestHandler { ORB_CLASS = orb; } - private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("jndi"), "org.apache.openejb.server.util.resources"); + private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("jndi"), "org.apache.openejb.server.util.resources"); private Context clientJndiTree; @@ -116,7 +116,7 @@ class JndiRequestHandler extends RequestHandler { } public boolean isDebug() { - return logger.isDebugEnabled(); + return LOGGER.isDebugEnabled(); } protected BasicClusterableRequestHandler newClusterableRequestHandler() { @@ -125,7 +125,7 @@ class JndiRequestHandler extends RequestHandler { @Override public Logger getLogger() { - return logger; + return LOGGER; } @Override @@ -149,7 +149,7 @@ class JndiRequestHandler extends RequestHandler { namingException.setRootCause(e); res.setResult(new ThrowableArtifact(namingException)); - if (logger.isDebugEnabled()) { + if (LOGGER.isDebugEnabled()) { try { logRequestResponse(req, res); } catch (Exception ignore) { @@ -201,10 +201,10 @@ class JndiRequestHandler extends RequestHandler { res.setMetaData(metaData); res.writeExternal(out); } catch (Throwable e) { - logger.fatal("Could not write JndiResponse to output stream", e); + LOGGER.fatal("Could not write JndiResponse to output stream", e); } - if (logger.isDebugEnabled()) { + if (LOGGER.isDebugEnabled()) { try { out.flush(); // force it to as correct as possible response size logRequestResponse(req, res); @@ -215,7 +215,7 @@ class JndiRequestHandler extends RequestHandler { } } else { - logger.error("JndiRequestHandler cannot process an instance of: " + response.getClass().getName()); + LOGGER.error("JndiRequestHandler cannot process an instance of: " + response.getClass().getName()); } } @@ -224,7 +224,7 @@ class JndiRequestHandler extends RequestHandler { final InputStream cis = info.getInputStream(); final OutputStream cos = info.getOutputStream(); - logger.debug("JNDI REQUEST: " + req + " (size = " + (null != cis ? CountingInputStream.class.cast(cis).getCount() : 0) + LOGGER.debug("JNDI REQUEST: " + req + " (size = " + (null != cis ? CountingInputStream.class.cast(cis).getCount() : 0) + "b, remote-ip =" + info.ip + ") -- RESPONSE: " + res + " (size = " + (null != cos ? CountingOutputStream.class.cast(cos).getCount() : 0) + "b)"); } @@ -395,7 +395,7 @@ class JndiRequestHandler extends RequestHandler { } // add port refs - final Map<QName, PortRefMetaData> portsByQName = new HashMap<QName, PortRefMetaData>(); + final Map<QName, PortRefMetaData> portsByQName = new HashMap<>(); for (final PortRefData portRef : serviceRef.getPortRefs()) { final PortRefMetaData portRefMetaData = new PortRefMetaData(); portRefMetaData.setQName(portRef.getQName()); @@ -538,7 +538,7 @@ class JndiRequestHandler extends RequestHandler { } private void log(final EJBMetaDataImpl metaData) { - if (logger.isDebugEnabled()) { + if (LOGGER.isDebugEnabled()) { final StringBuilder sb = new StringBuilder(); sb.append("Sending Ejb("); @@ -553,7 +553,7 @@ class JndiRequestHandler extends RequestHandler { sb.delete(sb.length() - delimiter.length(), sb.length()); } sb.append("])"); - logger.debug(sb.toString()); + LOGGER.debug(sb.toString()); } } http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java index d41d36f..97db8d7 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/KeepAliveServer.java @@ -57,7 +57,7 @@ public class KeepAliveServer implements ServerService { private final long timeout = (1000 * 10); private final AtomicBoolean running = new AtomicBoolean(false); - private final ConcurrentHashMap<Thread, Session> sessions = new ConcurrentHashMap<Thread, Session>(); + private final ConcurrentHashMap<Thread, Session> sessions = new ConcurrentHashMap<>(); private BlockingQueue<Runnable> threadQueue; private Timer timer; private final boolean gzip; @@ -130,7 +130,7 @@ public class KeepAliveServer implements ServerService { public void closeSessions() { // Close the ones we can - final List<Session> current = new ArrayList<Session>(); + final List<Session> current = new ArrayList<>(); current.addAll(this.sessions.values()); for (final Session session : current) { @@ -171,10 +171,20 @@ public class KeepAliveServer implements ServerService { return this.threadQueue; } + /** + * + * @param session + * @return + */ public Session addSession(final Session session) { return this.sessions.put(session.thread, session); } + /** + * + * @param session + * @return + */ public Session removeSession(final Session session) { return this.sessions.remove(session.thread); } http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/LogoutRequestHandler.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/LogoutRequestHandler.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/LogoutRequestHandler.java index 29668ac..66ab47a 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/LogoutRequestHandler.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/LogoutRequestHandler.java @@ -16,7 +16,6 @@ */ package org.apache.openejb.server.ejbd; -import org.apache.openejb.client.AuthenticationResponse; import org.apache.openejb.client.LogoutRequest; import org.apache.openejb.client.LogoutResponse; import org.apache.openejb.client.ProtocolMetaData; @@ -31,8 +30,8 @@ import java.io.ObjectInputStream; import java.io.ObjectOutputStream; class LogoutRequestHandler extends RequestHandler { - private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("auth"), "org.apache.openejb.server.util.resources"); - private static final boolean debug = logger.isDebugEnabled(); + private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_SERVER_REMOTE.createChild("auth"), "org.apache.openejb.server.util.resources"); + private static final boolean DEBUG = LOGGER.isDebugEnabled(); protected LogoutRequestHandler(final EjbDaemon daemon) { super(daemon); @@ -45,7 +44,7 @@ class LogoutRequestHandler extends RequestHandler { @Override public Logger getLogger() { - return logger; + return LOGGER; } @Override @@ -66,9 +65,9 @@ class LogoutRequestHandler extends RequestHandler { res.setResponseCode(ResponseCodes.LOGOUT_FAILED); res.setDeniedCause(t); } finally { - if (debug) { + if (DEBUG) { try { - logger.debug("LOGOUT REQUEST: " + req + " -- RESPONSE: " + res); + LOGGER.debug("LOGOUT REQUEST: " + req + " -- RESPONSE: " + res); } catch (Exception e) { //Ignore } @@ -86,10 +85,10 @@ class LogoutRequestHandler extends RequestHandler { try { res.writeExternal(out); } catch (final Exception e) { - logger.fatal("Could not write AuthenticationResponse to output stream", e); + LOGGER.fatal("Could not write AuthenticationResponse to output stream", e); } } else { - logger.error("AuthRequestHandler cannot process an instance of: " + response.getClass().getName()); + LOGGER.error("AuthRequestHandler cannot process an instance of: " + response.getClass().getName()); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/tomee/blob/e6226683/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java ---------------------------------------------------------------------- diff --git a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java index 800e478..25437ca 100644 --- a/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java +++ b/server/openejb-ejbd/src/main/java/org/apache/openejb/server/ejbd/ServerSideResolver.java @@ -44,7 +44,7 @@ public class ServerSideResolver implements EJBHomeProxyHandle.Resolver, EJBObjec final InterfaceType interfaceType = (ejb.getRemoteInterfaceClass() == null) ? InterfaceType.BUSINESS_REMOTE_HOME : InterfaceType.EJB_HOME; - final ArrayList<Class> interfaces = new ArrayList<Class>(); + final ArrayList<Class> interfaces = new ArrayList<>(); if (interfaceType.isBusiness()) { interfaces.addAll(ejb.getBusinessClasses()); } else { @@ -72,7 +72,7 @@ public class ServerSideResolver implements EJBHomeProxyHandle.Resolver, EJBObjec final InterfaceType interfaceType = (ejb.getRemoteInterfaceClass() == null) ? InterfaceType.BUSINESS_REMOTE_HOME : InterfaceType.EJB_HOME; - final ArrayList<Class> interfaces = new ArrayList<Class>(); + final ArrayList<Class> interfaces = new ArrayList<>(); if (interfaceType.isBusiness()) { interfaces.addAll(ejb.getBusinessClasses()); } else {
