You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2018/12/05 12:40:46 UTC
[01/12] tomee git commit: tomee::common naming convention
Repository: tomee
Updated Branches:
refs/heads/master 0bd243542 -> c165b2389
tomee::common naming convention
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4e07471d
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4e07471d
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4e07471d
Branch: refs/heads/master
Commit: 4e07471da871abc578c1c8a9c453c9be39dbe238
Parents: b4cf3cf
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 19:08:39 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 19:08:39 2018 +0100
----------------------------------------------------------------------
.../java/org/apache/tomee/common/NamingUtil.java | 12 ++++++------
.../org/apache/tomee/installer/Installer.java | 18 +++++++++---------
2 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4e07471d/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java b/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java
index 5a8a27f..6031c5c 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/common/NamingUtil.java
@@ -49,8 +49,8 @@ public class NamingUtil {
public static final String WS_PORT_QNAME = "wsportqname";
public static final String WSDL_URL = "wsdlurl";
- private static final AtomicInteger id = new AtomicInteger(31);
- private static final Map<String,Object> registry = new ConcurrentHashMap<String, Object>();
+ private static final AtomicInteger ID = new AtomicInteger(31);
+ private static final Map<String,Object> REGISTRY = new ConcurrentHashMap<String, Object>();
// these two attributes are used to be able to cleanup quickly the registry (otherwise we need to duplicate a lot of logic)
private static StandardContext currentContext;
@@ -79,8 +79,8 @@ public class NamingUtil {
}
public static void setStaticValue(final Resource resource, final String name, final Object value) {
- final String token = String.valueOf(id.incrementAndGet());
- registry.put(token, value);
+ final String token = String.valueOf(ID.incrementAndGet());
+ REGISTRY.put(token, value);
resource.setProperty("static-token" + (name != null ? "-" + name : ""), token);
if (currentContext != null) {
Collection<String> ids = ID_BY_CONTEXT.get(currentContext);
@@ -104,7 +104,7 @@ public class NamingUtil {
if (token == null) {
return null;
}
- final T object = (T) registry.get(token);
+ final T object = (T) REGISTRY.get(token);
return object;
}
@@ -144,7 +144,7 @@ public class NamingUtil {
final Collection<String> keys = ID_BY_CONTEXT.remove(context);
if (keys != null) {
for (final String k : keys) {
- registry.remove(k);
+ REGISTRY.remove(k);
}
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4e07471d/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
----------------------------------------------------------------------
diff --git a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
index 01d2c90..36ec230 100644
--- a/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
+++ b/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
@@ -32,31 +32,31 @@ public class Installer implements InstallerInterface {
private Status status = Status.NONE;
private boolean force;
- private static final boolean listenerInstalled;
- private static final boolean agentInstalled;
+ private static final boolean LISTENERINSTALLED;
+ private static final boolean AGENTINSTALLED;
static {
final Options opts = SystemInstance.get().getOptions();
// is the OpenEJB listener installed
- listenerInstalled = "OpenEJBListener".equals(opts.get("openejb.embedder.source", ""))
+ LISTENERINSTALLED = "OpenEJBListener".equals(opts.get("openejb.embedder.source", ""))
|| "ServerListener".equals(opts.get("openejb.embedder.source", ""));
// is the OpenEJB javaagent installed
- agentInstalled = InstallerTools.invokeStaticNoArgMethod(
+ AGENTINSTALLED = InstallerTools.invokeStaticNoArgMethod(
"org.apache.openejb.javaagent.Agent", "getInstrumentation") != null;
}
public static boolean isListenerInstalled() {
- return listenerInstalled;
+ return LISTENERINSTALLED;
}
public static boolean isAgentInstalled() {
- return agentInstalled;
+ return AGENTINSTALLED;
}
public Installer(final Paths paths) {
this.paths = paths;
- if (listenerInstalled && agentInstalled) {
+ if (LISTENERINSTALLED && AGENTINSTALLED) {
status = Status.INSTALLED;
}
}
@@ -377,7 +377,7 @@ public class Installer implements InstallerInterface {
}
public void installListener(final String listener) {
- if (listenerInstalled && !force) {
+ if (LISTENERINSTALLED && !force) {
// OpenEJB Listener already installed
return;
}
@@ -460,7 +460,7 @@ public class Installer implements InstallerInterface {
// the geronimo locator to find the implementation
// because it needs some OSGi API we don't want to add
public void installJavaagent() {
- if (agentInstalled && !force) {
+ if (AGENTINSTALLED && !force) {
// OpenEJB Agent already installed"
return;
}
[03/12] tomee git commit: use switch state here
Posted by jl...@apache.org.
use switch state here
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/3372bcd2
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/3372bcd2
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/3372bcd2
Branch: refs/heads/master
Commit: 3372bcd2741f76b7d41daaf9e772e4e558b13319
Parents: 520c943
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 19:20:14 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 19:20:14 2018 +0100
----------------------------------------------------------------------
.../openejb/server/webservices/WsService.java | 29 ++++++++++----------
1 file changed, 15 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/3372bcd2/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
index 74bfcea..7540cbe 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
@@ -562,20 +562,21 @@ public abstract class WsService implements ServerService, SelfManaging {
}
public static String getEjbType(final int type) {
- if (type == EnterpriseBeanInfo.STATEFUL) {
- return "StatefulBean";
- } else if (type == EnterpriseBeanInfo.STATELESS) {
- return "StatelessBean";
- } else if (type == EnterpriseBeanInfo.SINGLETON) {
- return "SingletonBean";
- } else if (type == EnterpriseBeanInfo.MANAGED) {
- return "ManagedBean";
- } else if (type == EnterpriseBeanInfo.MESSAGE) {
- return "MessageDrivenBean";
- } else if (type == EnterpriseBeanInfo.ENTITY) {
- return "StatefulBean";
- } else {
- return "UnknownBean";
+ switch (type) {
+ case EnterpriseBeanInfo.STATEFUL:
+ return "StatefulBean";
+ case EnterpriseBeanInfo.STATELESS:
+ return "StatelessBean";
+ case EnterpriseBeanInfo.SINGLETON:
+ return "SingletonBean";
+ case EnterpriseBeanInfo.MANAGED:
+ return "ManagedBean";
+ case EnterpriseBeanInfo.MESSAGE:
+ return "MessageDrivenBean";
+ case EnterpriseBeanInfo.ENTITY:
+ return "StatefulBean";
+ default:
+ return "UnknownBean";
}
}
[07/12] tomee git commit: use diamond operator and remove unused
imports
Posted by jl...@apache.org.
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 <ha...@kodnito.com>
Authored: Mon Dec 3 20:22:21 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
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 {
[02/12] tomee git commit: naming convention and usage of diamond
operator
Posted by jl...@apache.org.
naming convention and usage of diamond operator
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/520c9430
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/520c9430
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/520c9430
Branch: refs/heads/master
Commit: 520c9430a62d78405bacac8e3f757da31f1fb0f1
Parents: 4e07471
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 19:19:31 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 19:19:31 2018 +0100
----------------------------------------------------------------------
.../LightWeightMappingValidator.java | 12 +++++-
.../openejb/server/webservices/WsService.java | 42 ++++++++++----------
.../openejb/server/webservices/WsServlet.java | 27 +++++++++++--
.../openejb/server/webservices/WsdlVisitor.java | 4 +-
.../webservices/saaj/MessageFactoryImpl.java | 2 +
.../webservices/saaj/SaajFactoryFinder.java | 10 ++---
.../webservices/saaj/SaajMetaFactoryImpl.java | 2 +
.../server/webservices/saaj/SaajUniverse.java | 8 ++--
.../saaj/SoapConnectionFactoryImpl.java | 1 +
.../webservices/saaj/SoapFactoryImpl.java | 8 ++++
10 files changed, 79 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
index bb655e1..ab38688 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/LightWeightMappingValidator.java
@@ -62,16 +62,19 @@ public class LightWeightMappingValidator extends WsdlVisitor {
return !context.hasFailures() && !context.hasErrors();
}
+ @Override
protected void begin() {
- operationNames = new ArrayList<String>();
+ operationNames = new ArrayList<>();
}
+ @Override
protected void visit(Definition definition) {
if (definition.getServices().values().size() != 1) {
context.addFailure(new ValidationFailure("A lightweight RPC/Encoded service must contain only one Service"));
}
}
+ @Override
protected void visit(Output output) {
Map outputParts = output.getMessage().getParts();
if (outputParts.size() != 0 && outputParts.size() != 1) {
@@ -80,12 +83,14 @@ public class LightWeightMappingValidator extends WsdlVisitor {
}
+ @Override
protected void visit(Operation operation) {
if (!operationNames.add(operation.getName())) {
context.addFailure(new ValidationFailure("No two operations can have the same name: " + operation.getName()));
}
}
+ @Override
protected void visit(Fault fault) {
Part message = fault.getMessage().getPart("message");
if (message == null) {
@@ -96,6 +101,7 @@ public class LightWeightMappingValidator extends WsdlVisitor {
}
+ @Override
protected void visit(BindingInput bindingInput) {
SOAPBody body = getSOAPBody(bindingInput.getExtensibilityElements());
String encoding = body.getUse();
@@ -104,6 +110,7 @@ public class LightWeightMappingValidator extends WsdlVisitor {
}
}
+ @Override
protected void visit(BindingOutput bindingOutput) {
SOAPBody body = getSOAPBody(bindingOutput.getExtensibilityElements());
String encoding = body.getUse();
@@ -112,6 +119,7 @@ public class LightWeightMappingValidator extends WsdlVisitor {
}
}
+ @Override
protected void visit(BindingFault bindingFault) {
SOAPBody body = getSOAPBody(bindingFault.getExtensibilityElements());
String encoding = body.getUse();
@@ -120,6 +128,7 @@ public class LightWeightMappingValidator extends WsdlVisitor {
}
}
+ @Override
protected void visit(Binding binding) {
SOAPBinding soapBinding = getSOAPBinding(binding);
if (soapBinding == null || soapBinding.getStyle() == null || !soapBinding.getStyle().equals("rpc")) {
@@ -127,6 +136,7 @@ public class LightWeightMappingValidator extends WsdlVisitor {
}
}
+ @Override
protected void visit(Service service) {
if (service.getPorts().values().size() != 1) {
context.addFailure(new ValidationFailure("A lightweight RPC/Encoded service must contain only one Port"));
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
index 51bd23b..74bfcea 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsService.java
@@ -79,7 +79,7 @@ import java.util.concurrent.ConcurrentMap;
@SuppressWarnings("UnusedDeclaration")
public abstract class WsService implements ServerService, SelfManaging {
- public static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_WS, WsService.class);
+ public static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_WS, WsService.class);
public static final String WS_ADDRESS_FORMAT = "openejb.wsAddress.format";
public static final String WS_FORCE_ADDRESS = "openejb.webservice.deployment.address";
private static final boolean OLD_WEBSERVICE_DEPLOYMENT = SystemInstance.get().getOptions().get("openejb.webservice.old-deployment", false);
@@ -93,12 +93,12 @@ public abstract class WsService implements ServerService, SelfManaging {
private String transportGuarantee;
private String authMethod;
private String virtualHost;
- private final ConcurrentMap<AppInfo, Collection<BeanContext>> deployedApplications = new ConcurrentHashMap<AppInfo, Collection<BeanContext>>();
- private final Set<WebAppInfo> deployedWebApps = new HashSet<WebAppInfo>();
- private final Map<String, String> ejbLocations = new TreeMap<String, String>();
- private final Map<String, String> ejbAddresses = new TreeMap<String, String>();
- private final Map<String, String> servletAddresses = new TreeMap<String, String>();
- private final Map<String, List<EndpointInfo>> addressesByApplication = new TreeMap<String, List<EndpointInfo>>();
+ private final ConcurrentMap<AppInfo, Collection<BeanContext>> deployedApplications = new ConcurrentHashMap<>();
+ private final Set<WebAppInfo> deployedWebApps = new HashSet<>();
+ private final Map<String, String> ejbLocations = new TreeMap<>();
+ private final Map<String, String> ejbAddresses = new TreeMap<>();
+ private final Map<String, String> servletAddresses = new TreeMap<>();
+ private final Map<String, List<EndpointInfo>> addressesByApplication = new TreeMap<>();
public WsService() {
final String format = SystemInstance.get().getOptions().get(WS_ADDRESS_FORMAT, "/{ejbDeploymentId}");
@@ -199,7 +199,7 @@ public abstract class WsService implements ServerService, SelfManaging {
public void stop() throws ServiceException {
if (assembler != null) {
SystemInstance.get().removeObserver(this);
- for (final AppInfo appInfo : new ArrayList<AppInfo>(deployedApplications.keySet())) {
+ for (final AppInfo appInfo : new ArrayList<>(deployedApplications.keySet())) {
undeploy(new AssemblerBeforeApplicationDestroyed(appInfo, null));
}
assembler = null;
@@ -223,14 +223,14 @@ public abstract class WsService implements ServerService, SelfManaging {
public void newEjbToDeploy(final @Observes NewEjbAvailableAfterApplicationCreated event) {
final AppInfo app = event.getApp();
if (!deployedApplications.containsKey(app)) {
- deployedApplications.putIfAbsent(app, new LinkedList<BeanContext>());
+ deployedApplications.putIfAbsent(app, new LinkedList<>());
}
deployApp(app, event.getBeanContexts());
}
public void deploy(final @Observes AssemblerAfterApplicationCreated event) {
final AppInfo appInfo = event.getApp();
- if (deployedApplications.put(appInfo, new LinkedList<BeanContext>()) == null) {
+ if (deployedApplications.put(appInfo, new LinkedList<>()) == null) {
deployApp(appInfo, event.getContext().getBeanContexts());
}
}
@@ -258,14 +258,14 @@ public abstract class WsService implements ServerService, SelfManaging {
try {
moduleBaseUrl = new File(ejbJar.path).toURI().toURL();
} catch (final MalformedURLException e) {
- logger.error("Invalid ejb jar location " + ejbJar.path, e);
+ LOGGER.error("Invalid ejb jar location " + ejbJar.path, e);
}
}
StringTemplate deploymentIdTemplate = this.wsAddressTemplate;
if (ejbJar.properties.containsKey(WS_ADDRESS_FORMAT)) {
final String format = ejbJar.properties.getProperty(WS_ADDRESS_FORMAT);
- logger.info("Using " + WS_ADDRESS_FORMAT + " '" + format + "'");
+ LOGGER.info("Using " + WS_ADDRESS_FORMAT + " '" + format + "'");
deploymentIdTemplate = new StringTemplate(format);
}
contextData.put("ejbJarId", ejbJar.moduleName);
@@ -329,13 +329,13 @@ public abstract class WsService implements ServerService, SelfManaging {
// register wsdl location
portAddressRegistry.addPort(portInfo.serviceId, portInfo.wsdlService, portInfo.portId, portInfo.wsdlPort, portInfo.seiInterfaceName, address);
setWsdl(container, address);
- logger.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ") --> Ejb(id=" + portInfo.portId + ")");
+ LOGGER.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ") --> Ejb(id=" + portInfo.portId + ")");
ejbAddresses.put(bean.ejbDeploymentId, address);
addressesForApp(appInfo.appId).add(new EndpointInfo(address, port.getWsdlService(), beanContext.getBeanClass().getName()));
}
}
} catch (final Throwable e) {
- logger.error("Error deploying JAX-WS Web Service for EJB " + beanContext.getDeploymentID(), e);
+ LOGGER.error("Error deploying JAX-WS Web Service for EJB " + beanContext.getDeploymentID(), e);
} finally {
Thread.currentThread().setContextClassLoader(old);
}
@@ -367,7 +367,7 @@ public abstract class WsService implements ServerService, SelfManaging {
private List<EndpointInfo> addressesForApp(final String appId) {
if (!addressesByApplication.containsKey(appId)) {
- addressesByApplication.put(appId, new ArrayList<EndpointInfo>());
+ addressesByApplication.put(appId, new ArrayList<>());
}
return addressesByApplication.get(appId);
}
@@ -381,7 +381,7 @@ public abstract class WsService implements ServerService, SelfManaging {
if (!deployedWebApps.add(webApp))
return;
- final Map<String, PortInfo> ports = new TreeMap<String, PortInfo>();
+ final Map<String, PortInfo> ports = new TreeMap<>();
for (final PortInfo port : webApp.portInfos) {
ports.put(port.serviceLink, port);
}
@@ -390,7 +390,7 @@ public abstract class WsService implements ServerService, SelfManaging {
try {
moduleBaseUrl = new File(webApp.path).toURI().toURL();
} catch (final MalformedURLException e) {
- logger.error("Invalid ejb jar location " + webApp.path, e);
+ LOGGER.error("Invalid ejb jar location " + webApp.path, e);
}
Collection<IdPropertiesInfo> pojoConfiguration = null; // lazy init
@@ -441,12 +441,12 @@ public abstract class WsService implements ServerService, SelfManaging {
// add address to global registry
portAddressRegistry.addPort(portInfo.serviceId, portInfo.wsdlService, portInfo.portId, portInfo.wsdlPort, portInfo.seiInterfaceName, address);
setWsdl(container, address);
- logger.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ") --> Pojo(id=" + portInfo.portId + ")");
+ LOGGER.info("Webservice(wsdl=" + address + ", qname=" + port.getWsdlService() + ") --> Pojo(id=" + portInfo.portId + ")");
servletAddresses.put(webApp.moduleId + "." + servlet.servletName, address);
addressesForApp(webApp.moduleId).add(new EndpointInfo(address, port.getWsdlService(), target.getName()));
}
} catch (final Throwable e) {
- logger.error("Error deploying CXF webservice for servlet " + portInfo.serviceLink, e);
+ LOGGER.error("Error deploying CXF webservice for servlet " + portInfo.serviceLink, e);
} finally {
Thread.currentThread().setContextClassLoader(old);
}
@@ -461,7 +461,7 @@ public abstract class WsService implements ServerService, SelfManaging {
final AppInfo appInfo = event.getApp();
if (deployedApplications.remove(appInfo) != null) {
for (final EjbJarInfo ejbJar : appInfo.ejbJars) {
- final Map<String, PortInfo> ports = new TreeMap<String, PortInfo>();
+ final Map<String, PortInfo> ports = new TreeMap<>();
for (final PortInfo port : ejbJar.portInfos) {
ports.put(port.serviceLink, port);
}
@@ -502,7 +502,7 @@ public abstract class WsService implements ServerService, SelfManaging {
for (final WebAppInfo webApp : appInfo.webApps) {
deployedWebApps.remove(webApp);
- final Map<String, PortInfo> ports = new TreeMap<String, PortInfo>();
+ final Map<String, PortInfo> ports = new TreeMap<>();
for (final PortInfo port : webApp.portInfos) {
ports.put(port.serviceLink, port);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java
index bff828f..ff7d65c 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsServlet.java
@@ -43,7 +43,7 @@ public class WsServlet implements Servlet {
public static final String WEBSERVICE_CONTAINER = WsServlet.class.getName() + "@WebServiceContainer";
private static final DefaultContext DEFAULT_CONTEXT = new DefaultContext();
- private static final ThreadLocal<ServletEndpointContext> endpointContext = new ThreadLocal<ServletEndpointContext>();
+ private static final ThreadLocal<ServletEndpointContext> ENDPOINTCONTENT = new ThreadLocal<>();
private ServletConfig config;
private Object pojo;
@@ -71,20 +71,23 @@ public class WsServlet implements Servlet {
getService();
}
+ @Override
public ServletConfig getServletConfig() {
return config;
}
+ @Override
public String getServletInfo() {
return "Webservice Servlet " + getService();
}
+ @Override
public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException {
HttpListener service = getService();
if (service == null) throw new ServletException("WebServiceContainer has not been set");
ServletEndpointContext context = getContext();
- endpointContext.set(new InvocationContext((HttpServletRequest) req));
+ ENDPOINTCONTENT.set(new InvocationContext((HttpServletRequest) req));
try {
res.setContentType("text/xml");
HttpRequest httpRequest = new ServletRequestAdapter((HttpServletRequest) req, (HttpServletResponse) res, config.getServletContext());
@@ -102,10 +105,11 @@ public class WsServlet implements Servlet {
throw new ServletException("Error processing webservice request", e);
}
} finally {
- endpointContext.set(context);
+ ENDPOINTCONTENT.set(context);
}
}
+ @Override
public void destroy() {
if (pojo instanceof ServiceLifecycle) {
((ServiceLifecycle) pojo).destroy();
@@ -141,7 +145,7 @@ public class WsServlet implements Servlet {
}
private static ServletEndpointContext getContext() {
- ServletEndpointContext context = endpointContext.get();
+ ServletEndpointContext context = ENDPOINTCONTENT.get();
return context != null ? context : DEFAULT_CONTEXT;
}
@@ -152,22 +156,27 @@ public class WsServlet implements Servlet {
this.servletContext = servletContext;
}
+ @Override
public MessageContext getMessageContext() {
return getContext().getMessageContext();
}
+ @Override
public Principal getUserPrincipal() {
return getContext().getUserPrincipal();
}
+ @Override
public HttpSession getHttpSession() {
return getContext().getHttpSession();
}
+ @Override
public ServletContext getServletContext() {
return servletContext;
}
+ @Override
public boolean isUserInRole(String s) {
return getContext().isUserInRole(s);
}
@@ -181,22 +190,27 @@ public class WsServlet implements Servlet {
this.request = request;
}
+ @Override
public MessageContext getMessageContext() {
return (MessageContext) request.getAttribute(WsConstants.MESSAGE_CONTEXT);
}
+ @Override
public Principal getUserPrincipal() {
return request.getUserPrincipal();
}
+ @Override
public HttpSession getHttpSession() {
return request.getSession();
}
+ @Override
public ServletContext getServletContext() {
throw new IllegalAccessError("InstanceContext should never delegate this method.");
}
+ @Override
public boolean isUserInRole(String s) {
return request.isUserInRole(s);
}
@@ -204,22 +218,27 @@ public class WsServlet implements Servlet {
private static class DefaultContext implements ServletEndpointContext {
+ @Override
public MessageContext getMessageContext() {
throw new IllegalStateException("Method cannot be called outside a request context");
}
+ @Override
public Principal getUserPrincipal() {
throw new IllegalStateException("Method cannot be called outside a request context");
}
+ @Override
public HttpSession getHttpSession() {
throw new javax.xml.rpc.JAXRPCException("Method cannot be called outside an http request context");
}
+ @Override
public ServletContext getServletContext() {
throw new IllegalAccessError("InstanceContext should never delegate this method.");
}
+ @Override
public boolean isUserInRole(String s) {
throw new IllegalStateException("Method cannot be called outside a request context");
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java
index a72466e..58b3643 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/WsdlVisitor.java
@@ -44,7 +44,7 @@ import java.util.List;
import java.util.Map;
public class WsdlVisitor {
- private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_WS, WsdlVisitor.class);
+ private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_WS, WsdlVisitor.class);
protected final Definition definition;
@@ -123,7 +123,7 @@ public class WsdlVisitor {
}
}
} catch (Exception e) {
- logger.error(e.getMessage(), e);
+ LOGGER.error(e.getMessage(), e);
} finally {
end();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/MessageFactoryImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/MessageFactoryImpl.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/MessageFactoryImpl.java
index e6de078..5a82edb 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/MessageFactoryImpl.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/MessageFactoryImpl.java
@@ -28,10 +28,12 @@ public class MessageFactoryImpl extends MessageFactory {
return (MessageFactory) SaajFactoryFinder.find("javax.xml.soap.MessageFactory");
}
+ @Override
public SOAPMessage createMessage() throws SOAPException {
return getMessageFactory().createMessage();
}
+ @Override
public SOAPMessage createMessage(MimeHeaders arg0, InputStream arg1) throws IOException, SOAPException {
return getMessageFactory().createMessage(arg0, arg1);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajFactoryFinder.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajFactoryFinder.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajFactoryFinder.java
index 80df82d..7a74b17 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajFactoryFinder.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajFactoryFinder.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
import java.util.Map;
class SaajFactoryFinder {
- private static final Logger logger = Logger.getInstance(LogCategory.OPENEJB_WS, SaajFactoryFinder.class);
+ private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_WS, SaajFactoryFinder.class);
private static final String SAAJ_PROVIDER_PROPERTY = "org.apache.openejb.server.webservices.saaj.provider";
private static SaajUniverse.Type DEFAULT_SAAJ_UNIVERSE = null;
@@ -67,17 +67,17 @@ class SaajFactoryFinder {
}
if (DEFAULT_SAAJ_UNIVERSE != null) {
- logger.info("Default SAAJ universe: " + DEFAULT_SAAJ_UNIVERSE);
+ LOGGER.info("Default SAAJ universe: " + DEFAULT_SAAJ_UNIVERSE);
} else {
- logger.info("Default SAAJ universe not set");
+ LOGGER.info("Default SAAJ universe not set");
}
} else {
- logger.info("Default SAAJ universe not set");
+ LOGGER.info("Default SAAJ universe not set");
}
}
private static Map<String, String> createSAAJInfo(String messageFactory, String soapFactory, String soapConnectionFactory, String metaFactory) {
- Map<String, String> map = new HashMap<String, String>();
+ Map<String, String> map = new HashMap<>();
map.put("javax.xml.soap.MessageFactory", messageFactory);
map.put("javax.xml.soap.SOAPFactory", soapFactory);
map.put("javax.xml.soap.SOAPConnectionFactory", soapConnectionFactory);
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java
index 15e247b..2a43b3e 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajMetaFactoryImpl.java
@@ -26,10 +26,12 @@ import javax.xml.soap.SOAPFactory;
public class SaajMetaFactoryImpl extends SAAJMetaFactory {
+ @Override
protected MessageFactory newMessageFactory(String arg0) throws SOAPException {
return (MessageFactory) callFactoryMethod("newMessageFactory", arg0);
}
+ @Override
protected SOAPFactory newSOAPFactory(String arg0) throws SOAPException {
return (SOAPFactory) callFactoryMethod("newSOAPFactory", arg0);
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajUniverse.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajUniverse.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajUniverse.java
index c6cffe5..0394f92 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajUniverse.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SaajUniverse.java
@@ -47,7 +47,7 @@ public class SaajUniverse {
public static final Type AXIS1 = Type.AXIS1;
public static final Type AXIS2 = Type.AXIS2;
- private static final ThreadLocal<LinkedList<Type>> currentUniverse =
+ private static final ThreadLocal<LinkedList<Type>> CURRENTUNIVERSE =
new ThreadLocal<LinkedList<Type>>() {
@Override
protected LinkedList<Type> initialValue() {
@@ -56,7 +56,7 @@ public class SaajUniverse {
};
public void set(Type newUniverse) {
- final LinkedList<Type> universeList = currentUniverse.get();
+ final LinkedList<Type> universeList = CURRENTUNIVERSE.get();
universeList.add(newUniverse);
if (logger.isDebugEnabled()) {
logger.debug("Set universe: " + Thread.currentThread() + " " + newUniverse);
@@ -64,7 +64,7 @@ public class SaajUniverse {
}
public void unset() {
- final LinkedList<Type> universeList = currentUniverse.get();
+ final LinkedList<Type> universeList = CURRENTUNIVERSE.get();
if (universeList != null && !universeList.isEmpty()) {
universeList.removeLast();
if (logger.isDebugEnabled()) {
@@ -74,7 +74,7 @@ public class SaajUniverse {
}
static Type getCurrentUniverse() {
- final LinkedList<Type> universeList = currentUniverse.get();
+ final LinkedList<Type> universeList = CURRENTUNIVERSE.get();
if (universeList != null && !universeList.isEmpty()) {
return universeList.getLast();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapConnectionFactoryImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapConnectionFactoryImpl.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapConnectionFactoryImpl.java
index 3c881bb..92f7f49 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapConnectionFactoryImpl.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapConnectionFactoryImpl.java
@@ -29,6 +29,7 @@ public class SoapConnectionFactoryImpl extends SOAPConnectionFactory {
}
+ @Override
public SOAPConnection createConnection() throws SOAPException {
return getSOAPConnectionFactory().createConnection();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/520c9430/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapFactoryImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapFactoryImpl.java b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapFactoryImpl.java
index 443aa39..d5415ff 100644
--- a/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapFactoryImpl.java
+++ b/server/openejb-webservices/src/main/java/org/apache/openejb/server/webservices/saaj/SoapFactoryImpl.java
@@ -33,34 +33,42 @@ public class SoapFactoryImpl extends SOAPFactory {
}
+ @Override
public Detail createDetail() throws SOAPException {
return getSOAPFactory().createDetail();
}
+ @Override
public SOAPElement createElement(Name arg0) throws SOAPException {
return getSOAPFactory().createElement(arg0);
}
+ @Override
public SOAPElement createElement(String arg0) throws SOAPException {
return getSOAPFactory().createElement(arg0);
}
+ @Override
public SOAPElement createElement(String arg0, String arg1, String arg2) throws SOAPException {
return getSOAPFactory().createElement(arg0, arg1, arg2);
}
+ @Override
public SOAPFault createFault() throws SOAPException {
return getSOAPFactory().createFault();
}
+ @Override
public SOAPFault createFault(String arg0, QName arg1) throws SOAPException {
return getSOAPFactory().createFault(arg0, arg1);
}
+ @Override
public Name createName(String arg0) throws SOAPException {
return getSOAPFactory().createName(arg0);
}
+ @Override
public Name createName(String arg0, String arg1, String arg2) throws SOAPException {
return getSOAPFactory().createName(arg0, arg1, arg2);
}
[08/12] tomee git commit: openejb-common-cli: use diamond operator
Posted by jl...@apache.org.
openejb-common-cli: use diamond operator
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/87349258
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/87349258
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/87349258
Branch: refs/heads/master
Commit: 873492589d0cc81c8c5545c6a5ef0d9b98722343
Parents: e622668
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 20:26:33 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 20:26:33 2018 +0100
----------------------------------------------------------------------
.../org/apache/openejb/server/cli/command/ClassLoaderCommand.java | 2 +-
.../org/apache/openejb/server/cli/command/DeployedAppCommand.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/87349258/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ClassLoaderCommand.java
----------------------------------------------------------------------
diff --git a/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ClassLoaderCommand.java b/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ClassLoaderCommand.java
index 9d39cf0..54904f6 100644
--- a/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ClassLoaderCommand.java
+++ b/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/ClassLoaderCommand.java
@@ -52,7 +52,7 @@ public class ClassLoaderCommand extends AbstractCommand {
}
protected void dumpClassLoader(final ClassLoader classLoader) {
- final List<ClassLoader> classLoaders = new ArrayList<ClassLoader>();
+ final List<ClassLoader> classLoaders = new ArrayList<>();
ClassLoader current = classLoader;
while (current != null) {
classLoaders.add(current);
http://git-wip-us.apache.org/repos/asf/tomee/blob/87349258/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/DeployedAppCommand.java
----------------------------------------------------------------------
diff --git a/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/DeployedAppCommand.java b/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/DeployedAppCommand.java
index ac7dc75..a3e4eb3 100644
--- a/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/DeployedAppCommand.java
+++ b/server/openejb-common-cli/src/main/java/org/apache/openejb/server/cli/command/DeployedAppCommand.java
@@ -30,7 +30,7 @@ public class DeployedAppCommand extends PathCommand {
@Override
public void execute(final String cmd) {
streamManager.writeOut("Deployed applications:");
- final List<AppContext> apps = new ArrayList<AppContext>(SystemInstance.get()
+ final List<AppContext> apps = new ArrayList<>(SystemInstance.get()
.getComponent(ContainerSystem.class).getAppContexts());
Collections.sort(apps, new AppContextComparable());
for (AppContext appContext : apps) {
[04/12] tomee git commit: usage of diamonoperator,
remove of unussed imports and naming convention
Posted by jl...@apache.org.
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 <ha...@kodnito.com>
Authored: Mon Dec 3 19:30:06 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
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;
[10/12] tomee git commit: openejb-axis: Java Docs,
use diamond operator and remove unused import
Posted by jl...@apache.org.
openejb-axis: Java Docs, use diamond operator and remove unused import
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4bc58e97
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4bc58e97
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4bc58e97
Branch: refs/heads/master
Commit: 4bc58e97c3959a478cada04c86e8187c7864186f
Parents: d27842c
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 21:12:24 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 21:12:24 2018 +0100
----------------------------------------------------------------------
.../apache/openejb/server/axis/AxisService.java | 8 +-
.../openejb/server/axis/AxisWsContainer.java | 17 +-
.../openejb/server/axis/EjbRpcProvider.java | 22 +-
.../openejb/server/axis/PojoProvider.java | 21 ++
.../server/axis/ReadOnlyServiceDesc.java | 208 +++++++++++++++++++
.../assembler/CommonsSchemaInfoBuilder.java | 14 +-
.../axis/assembler/CommonsSchemaLoader.java | 11 +-
.../HeavyweightOperationInfoBuilder.java | 112 +++++-----
.../assembler/HeavyweightTypeInfoBuilder.java | 26 +--
.../server/axis/assembler/JaxRpcFaultInfo.java | 2 +-
.../axis/assembler/JaxRpcOperationInfo.java | 4 +-
.../axis/assembler/JaxRpcServiceInfo.java | 4 +-
.../assembler/JaxRpcServiceInfoBuilder.java | 2 +-
.../server/axis/assembler/JaxRpcTypeInfo.java | 2 +-
.../assembler/LightweightTypeInfoBuilder.java | 4 +-
.../server/axis/assembler/XmlSchemaInfo.java | 4 +-
.../server/axis/assembler/XmlTypeInfo.java | 4 +-
.../server/axis/client/ArrayTypeInfo.java | 10 +
.../server/axis/client/AxisClientImpl.java | 6 +
.../axis/client/AxisServiceReference.java | 6 +
.../client/GenericServiceEndpointWrapper.java | 3 +
.../axis/client/NoOverrideCallbackFilter.java | 8 +
.../ServiceEndpointMethodInterceptor.java | 10 +
.../axis/client/ServiceMethodInterceptor.java | 10 +
24 files changed, 417 insertions(+), 101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
index fbfa60c..8ba059b 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisService.java
@@ -48,8 +48,9 @@ import java.util.Map;
import java.util.TreeMap;
public class AxisService extends WsService {
- private final Map<String, AxisWsContainer> wsContainers = new TreeMap<String, AxisWsContainer>();
+ private final Map<String, AxisWsContainer> wsContainers = new TreeMap<>();
+ @Override
public String getName() {
return "axis";
}
@@ -95,6 +96,7 @@ public class AxisService extends WsService {
}
+ @Override
protected void destroyEjbWsContainer(String deploymentId) {
AxisWsContainer container = wsContainers.remove(deploymentId);
if (container != null) {
@@ -102,6 +104,7 @@ public class AxisService extends WsService {
}
}
+ @Override
protected HttpListener createPojoWsContainer(ClassLoader loader, URL moduleBaseUrl, PortData port, String serviceId, Class target, Context context, String contextRoot, Map<String, Object> bdgs, ServiceConfiguration serviceInfos) throws Exception {
ClassLoader classLoader = target.getClassLoader();
@@ -131,6 +134,7 @@ public class AxisService extends WsService {
return container;
}
+ @Override
protected void destroyPojoWsContainer(String serviceId) {
AxisWsContainer container = wsContainers.remove(serviceId);
if (container != null) {
@@ -143,7 +147,7 @@ public class AxisService extends WsService {
if (handlerChains == null || handlerChains.isEmpty()) return null;
List<HandlerData> handlers = handlerChains.get(0).getHandlers();
- List<HandlerInfo> handlerInfos = new ArrayList<HandlerInfo>(handlers.size());
+ List<HandlerInfo> handlerInfos = new ArrayList<>(handlers.size());
for (HandlerData handler : handlers) {
Class<?> handlerClass = handler.getHandlerClass();
Map initParams = new HashMap(handler.getInitParams());
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
index d4b1d75..67ac0f9 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/AxisWsContainer.java
@@ -50,7 +50,7 @@ import java.util.Iterator;
import java.util.Map;
public class AxisWsContainer implements HttpListener {
- private static final Logger logger = Logger.getInstance(LogCategory.AXIS, AxisWsContainer.class);
+ private static final Logger LOGGER = Logger.getInstance(LogCategory.AXIS, AxisWsContainer.class);
public static final String REQUEST = AxisWsContainer.class.getName() + "@Request";
public static final String RESPONSE = AxisWsContainer.class.getName() + "@Response";
@@ -73,6 +73,13 @@ public class AxisWsContainer implements HttpListener {
}
}
+ /**
+ *
+ * @param request HttpRequest
+ * @param response HttpResponse
+ * @throws Exception
+ */
+ @Override
public void onMessage(final HttpRequest request, final HttpResponse response) throws Exception {
final SaajUniverse universe = new SaajUniverse();
universe.set(SaajUniverse.AXIS1);
@@ -186,7 +193,7 @@ public class AxisWsContainer implements HttpListener {
getSOAPConstants());
responseMessage.writeTo(res.getOutputStream());
} catch (final Exception e) {
- logger.warning(Messages.getMessage("exception00"), e);
+ LOGGER.warning(Messages.getMessage("exception00"), e);
}
} finally {
Thread.currentThread().setContextClassLoader(oldClassLoader);
@@ -199,13 +206,13 @@ public class AxisWsContainer implements HttpListener {
responseMessage = context.getResponseMessage();
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
Message responseMsg = responseMessage;
- logger.warning(Messages.getMessage("exception00"), e);
+ LOGGER.warning(Messages.getMessage("exception00"), e);
if (responseMsg == null) {
final AxisFault fault = AxisFault.makeFault(e);
//log the fault
final Element runtimeException = fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
if (runtimeException != null) {
- logger.debug(Messages.getMessage("axisFault00"), fault);
+ LOGGER.debug(Messages.getMessage("axisFault00"), fault);
//strip runtime details
fault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
}
@@ -221,7 +228,7 @@ public class AxisWsContainer implements HttpListener {
Message responseMessage;
final Element runtimeException = fault.lookupFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
- logger.warning(Messages.getMessage("axisFault00"), fault);
+ LOGGER.warning(Messages.getMessage("axisFault00"), fault);
if (runtimeException != null) {
//strip runtime details
fault.removeFaultDetail(Constants.QNAME_FAULTDETAIL_RUNTIMEEXCEPTION);
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
index 498b5e3..c61e3bf 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/EjbRpcProvider.java
@@ -35,7 +35,6 @@ import org.apache.axis.providers.java.RPCProvider;
import org.apache.axis.utils.JavaUtils;
import org.apache.openejb.ApplicationException;
import org.apache.openejb.BeanContext;
-import org.apache.openejb.InvalidateReferenceException;
import org.apache.openejb.RpcContainer;
import org.apache.openejb.InterfaceType;
import org.apache.openejb.server.ServerRuntimeException;
@@ -63,7 +62,7 @@ public class EjbRpcProvider extends RPCProvider {
public EjbRpcProvider(BeanContext ejbDeployment) {
this.ejbDeployment = ejbDeployment;
- this.handlerInfos = new ArrayList<HandlerInfo>();
+ this.handlerInfos = new ArrayList<>();
}
public EjbRpcProvider(BeanContext ejbDeployment, List<HandlerInfo> handlerInfos) {
@@ -71,6 +70,15 @@ public class EjbRpcProvider extends RPCProvider {
this.handlerInfos = handlerInfos;
}
+ /**
+ *
+ * @param msgContext msgContext
+ * @param reqEnv reqEnv
+ * @param resEnv resEnv
+ * @param obj obj
+ * @throws Exception
+ */
+ @Override
public void processMessage(MessageContext msgContext, SOAPEnvelope reqEnv, SOAPEnvelope resEnv, Object obj) throws Exception {
RPCElement body = getBody(reqEnv, msgContext);
@@ -98,6 +106,16 @@ public class EjbRpcProvider extends RPCProvider {
}
}
+ /**
+ *
+ * @param msgContext msgContext
+ * @param service service
+ * @param clsName clsName
+ * @param scopeHolder scopeHolder
+ * @return
+ * @throws Exception
+ */
+ @Override
public Object getServiceObject(MessageContext msgContext, Handler service, String clsName, IntHolder scopeHolder) throws Exception {
return ejbDeployment;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
index 7520311..9638897 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/PojoProvider.java
@@ -26,11 +26,32 @@ import javax.xml.rpc.holders.IntHolder;
import java.lang.reflect.Method;
public class PojoProvider extends RPCProvider {
+
+ /**
+ *
+ * @param msgContext msgContext
+ * @param service service
+ * @param clsName clsName
+ * @param scopeHolder scopeHolder
+ * @return
+ * @throws Exception
+ */
+ @Override
public Object getServiceObject(MessageContext msgContext, Handler service, String clsName, IntHolder scopeHolder) throws Exception {
HttpRequest request = (HttpRequest) msgContext.getProperty(AxisWsContainer.REQUEST);
return request.getAttribute(WsConstants.POJO_INSTANCE);
}
+ /**
+ *
+ * @param msgContext msgContext
+ * @param interfaceMethod interfaceMethod
+ * @param pojo pojo
+ * @param arguments arguments
+ * @return
+ * @throws Exception
+ */
+ @Override
protected Object invokeMethod(MessageContext msgContext, Method interfaceMethod, Object pojo, Object[] arguments) throws Exception {
Class pojoClass = pojo.getClass();
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
index 2c1b1b9..4a6bb11 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/ReadOnlyServiceDesc.java
@@ -34,152 +34,360 @@ public class ReadOnlyServiceDesc extends JavaServiceDesc {
this.serviceDesc = serviceDesc;
}
+ /**
+ *
+ * @return
+ */
+ @Override
public Class getImplClass() {
return serviceDesc.getImplClass();
}
+ /**
+ *
+ * @param implClass implClass
+ */
+ @Override
public void setImplClass(Class implClass) {
serviceDesc.setImplClass(implClass);
}
+ /**
+ *
+ * @return
+ */
+ @Override
public ArrayList getStopClasses() {
return serviceDesc.getStopClasses();
}
+ /**
+ *
+ * @param stopClasses stopClasses
+ */
+ @Override
public void setStopClasses(ArrayList stopClasses) {
}
+ @Override
public void loadServiceDescByIntrospection() {
serviceDesc.loadServiceDescByIntrospection();
}
+ /**
+ *
+ * @param implClass implClass
+ */
+ @Override
public void loadServiceDescByIntrospection(Class implClass) {
serviceDesc.loadServiceDescByIntrospection(implClass);
}
+ /**
+ *
+ * @param cls cls
+ * @param tm tm
+ */
+ @Override
public void loadServiceDescByIntrospection(Class cls, TypeMapping tm) {
serviceDesc.loadServiceDescByIntrospection(cls, tm);
}
+ /**
+ *
+ * @return
+ */
+ @Override
public Style getStyle() {
return serviceDesc.getStyle();
}
+ /**
+ *
+ * @param style style
+ */
+ @Override
public void setStyle(Style style) {
}
+ /**
+ *
+ * @return
+ */
+ @Override
public Use getUse() {
return serviceDesc.getUse();
}
+ /**
+ *
+ * @param use
+ */
+ @Override
public void setUse(Use use) {
}
+ /**
+ *
+ * @return
+ */
+ @Override
public String getWSDLFile() {
return serviceDesc.getWSDLFile();
}
+ /**
+ *
+ * @param wsdlFileName Name of the WSDL
+ */
+ @Override
public void setWSDLFile(String wsdlFileName) {
}
+ /**
+ *
+ * @return List of Allowed Methods
+ */
+ @Override
public List getAllowedMethods() {
return serviceDesc.getAllowedMethods();
}
+ /**
+ *
+ * @param allowedMethods
+ */
+ @Override
public void setAllowedMethods(List allowedMethods) {
}
+ /**
+ *
+ * @return TypeMapping
+ */
+ @Override
public TypeMapping getTypeMapping() {
return serviceDesc.getTypeMapping();
}
+ /**
+ *
+ * @param tm Set TypeMapping
+ */
+ @Override
public void setTypeMapping(TypeMapping tm) {
}
+ /**
+ *
+ * @return Name
+ */
+ @Override
public String getName() {
return serviceDesc.getName();
}
+ /**
+ *
+ * @param name Set Name
+ */
+ @Override
public void setName(String name) {
}
+ /**
+ *
+ * @return Documentation
+ */
+ @Override
public String getDocumentation() {
return serviceDesc.getDocumentation();
}
+ /**
+ *
+ * @param documentation Set Documentation
+ */
+ @Override
public void setDocumentation(String documentation) {
}
+ /**
+ *
+ * @param operation Remove Operation
+ */
+ @Override
public void removeOperationDesc(OperationDesc operation) {
}
+ /**
+ *
+ * @param operation Add Operation
+ */
+ @Override
public void addOperationDesc(OperationDesc operation) {
}
+ /**
+ *
+ * @return List Of Operations
+ */
+ @Override
public ArrayList getOperations() {
return serviceDesc.getOperations();
}
+ /**
+ *
+ * @param methodName Method Name
+ * @return Array Of Operation By Name
+ */
+ @Override
public OperationDesc[] getOperationsByName(String methodName) {
return serviceDesc.getOperationsByName(methodName);
}
+ /**
+ *
+ * @param methodName Method Name
+ * @return Operation By Name
+ */
+ @Override
public OperationDesc getOperationByName(String methodName) {
return serviceDesc.getOperationByName(methodName);
}
+ /**
+ *
+ * @param qname QName
+ * @return OperationDesc by Element QName
+ */
+ @Override
public OperationDesc getOperationByElementQName(QName qname) {
return serviceDesc.getOperationByElementQName(qname);
}
+ /**
+ *
+ * @param qname QName
+ * @return Array Of OperationDesc by QName
+ */
+ @Override
public OperationDesc[] getOperationsByQName(QName qname) {
return serviceDesc.getOperationsByQName(qname);
}
+ /**
+ *
+ * @param namespaces List of Namespaces
+ */
+ @Override
public void setNamespaceMappings(List namespaces) {
}
+ /**
+ *
+ * @return Default Namespace
+ */
+ @Override
public String getDefaultNamespace() {
return serviceDesc.getDefaultNamespace();
}
+ /**
+ *
+ * @param namespace Set Namespace
+ */
+ @Override
public void setDefaultNamespace(String namespace) {
}
+ /**
+ *
+ * @param name Name of the property
+ * @param value Value of the property
+ */
+ @Override
public void setProperty(String name, Object value) {
serviceDesc.setProperty(name, value);
}
+ /**
+ *
+ * @param name
+ * @return
+ */
+ @Override
public Object getProperty(String name) {
return serviceDesc.getProperty(name);
}
+ /**
+ *
+ * @return Endpoint URL
+ */
+ @Override
public String getEndpointURL() {
return serviceDesc.getEndpointURL();
}
+ /**
+ *
+ * @param endpointURL Endpoint URL
+ */
+ @Override
public void setEndpointURL(String endpointURL) {
}
+ /**
+ *
+ * @return TypeMappingRegistry
+ */
+ @Override
public TypeMappingRegistry getTypeMappingRegistry() {
return serviceDesc.getTypeMappingRegistry();
}
+ /**
+ *
+ * @param tmr
+ */
+ @Override
public void setTypeMappingRegistry(TypeMappingRegistry tmr) {
}
+ /**
+ *
+ * @return boolean
+ */
+ @Override
public boolean isInitialized() {
return serviceDesc.isInitialized();
}
+ /**
+ *
+ * @return boolean
+ */
+ @Override
public boolean isWrapped() {
return serviceDesc.isWrapped();
}
+ /**
+ *
+ * @return List of Disallowed Methods
+ */
+ @Override
public List getDisallowedMethods() {
return serviceDesc.getDisallowedMethods();
}
+ /**
+ *
+ * @param disallowedMethods Set List of Disallowed Methods
+ */
+ @Override
public void setDisallowedMethods(List disallowedMethods) {
}
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
index 01e5828..2fb25c1 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaInfoBuilder.java
@@ -55,7 +55,7 @@ import java.util.Map;
import java.util.jar.JarFile;
public class CommonsSchemaInfoBuilder {
- private static final Log log = LogFactory.getLog(CommonsSchemaInfoBuilder.class);
+ private static final Log LOG = LogFactory.getLog(CommonsSchemaInfoBuilder.class);
private static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
private static final String XML_NS_NS = "http://www.w3.org/2000/xmlns/";
private static final String SOAP_ENCODING_NS = "http://schemas.xmlsoap.org/soap/encoding/";
@@ -65,8 +65,8 @@ public class CommonsSchemaInfoBuilder {
private final XmlSchemaCollection xmlSchemaCollection;
- private final Map<QName, XmlTypeInfo> xmlTypes = new HashMap<QName, XmlTypeInfo>();
- private final Map<QName, XmlElementInfo> xmlElements = new HashMap<QName, XmlElementInfo>();
+ private final Map<QName, XmlTypeInfo> xmlTypes = new HashMap<>();
+ private final Map<QName, XmlElementInfo> xmlElements = new HashMap<>();
public CommonsSchemaInfoBuilder(JarFile moduleFile, URI wsdlUri) throws OpenEJBException {
if (moduleFile == null) throw new NullPointerException("moduleFile is null");
@@ -254,7 +254,7 @@ public class CommonsSchemaInfoBuilder {
}
}
} else {
- log.warn("Unknown schema type class " + typeInfo.getClass().getName());
+ LOG.warn("Unknown schema type class " + typeInfo.getClass().getName());
}
return typeInfo;
@@ -323,7 +323,7 @@ public class CommonsSchemaInfoBuilder {
componentType = new QName(namespace, localPart);
}
- log.debug("determined component type from element type");
+ LOG.debug("determined component type from element type");
return componentType;
}
}
@@ -351,7 +351,7 @@ public class CommonsSchemaInfoBuilder {
if (item instanceof XmlSchemaElement) {
XmlSchemaElement element = (XmlSchemaElement) item;
QName componentType = element.getSchemaTypeName();
- log.debug("determined component type from element type");
+ LOG.debug("determined component type from element type");
return componentType;
}
}
@@ -385,7 +385,7 @@ public class CommonsSchemaInfoBuilder {
private static List<XmlSchemaElement> getNestedElements(XmlSchemaComplexType complexType) {
- List<XmlSchemaElement> elements = new ArrayList<XmlSchemaElement>();
+ List<XmlSchemaElement> elements = new ArrayList<>();
XmlSchemaParticle particle = complexType.getParticle();
if (particle instanceof XmlSchemaElement) {
XmlSchemaElement element = (XmlSchemaElement) particle;
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
index d9ec86b..fc6738b 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/CommonsSchemaLoader.java
@@ -48,7 +48,7 @@ import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
public class CommonsSchemaLoader {
- private static final Log log = LogFactory.getLog(CommonsSchemaLoader.class);
+ private static final Log LOG = LogFactory.getLog(CommonsSchemaLoader.class);
private final URI wsdlUri;
private final JarFile moduleFile;
@@ -103,7 +103,7 @@ public class CommonsSchemaLoader {
if (importedDef != null) {
addImportsFromDefinition(importedDef);
} else {
- log.warn("Missing definition in import for namespace " + namespaceURI);
+ LOG.warn("Missing definition in import for namespace " + namespaceURI);
}
}
}
@@ -166,7 +166,7 @@ public class CommonsSchemaLoader {
class JarWSDLLocator implements WSDLLocator {
- private final List<InputStream> streams = new ArrayList<InputStream>();
+ private final List<InputStream> streams = new ArrayList<>();
private final URI wsdlURI;
private URI latestImportURI;
@@ -174,6 +174,7 @@ public class CommonsSchemaLoader {
this.wsdlURI = wsdlURI;
}
+ @Override
public InputSource getBaseInputSource() {
ZipEntry entry = moduleFile.getEntry(wsdlURI.toString());
if (entry == null) {
@@ -190,10 +191,12 @@ public class CommonsSchemaLoader {
return new InputSource(wsdlInputStream);
}
+ @Override
public String getBaseURI() {
return wsdlURI.toString();
}
+ @Override
public InputSource getImportInputSource(String parentLocation, String relativeLocation) {
URI parentURI = URI.create(parentLocation);
latestImportURI = parentURI.resolve(relativeLocation);
@@ -212,10 +215,12 @@ public class CommonsSchemaLoader {
return inputSource;
}
+ @Override
public String getLatestImportURI() {
return latestImportURI.toString();
}
+ @Override
public void close() {
for (InputStream inputStream : streams) {
try {
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
index 27fac57..cc5bf7a 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightOperationInfoBuilder.java
@@ -84,26 +84,26 @@ public class HeavyweightOperationInfoBuilder {
//
// Used to map exception class constructor args
//
- private final Map<QName, String> publicTypes = new HashMap<QName, String>();
- private final Map<String, String> anonymousTypes = new HashMap<String, String>();
+ private final Map<QName, String> publicTypes = new HashMap<>();
+ private final Map<String, String> anonymousTypes = new HashMap<>();
//
// Track in and out parameter names so we can verify that
// everything has been mapped and mapped correctly
//
- private final Set<String> inParamNames = new HashSet<String>();
- private final Set<String> outParamNames = new HashSet<String>();
+ private final Set<String> inParamNames = new HashSet<>();
+ private final Set<String> outParamNames = new HashSet<>();
//
// Track the wrapper elements - used by HeavyweightTypeInfoBuilder
//
- private final Set<QName> wrapperElementQNames = new HashSet<QName>();
+ private final Set<QName> wrapperElementQNames = new HashSet<>();
private final String operationName;
private final JaxRpcOperationInfo.OperationStyle operationStyle;
private final Message inputMessage;
private final Message outputMessage;
- private final Collection<Fault> faults = new ArrayList<Fault>();
+ private final Collection<Fault> faults = new ArrayList<>();
private JaxRpcOperationInfo operationInfo;
@@ -197,7 +197,7 @@ public class HeavyweightOperationInfoBuilder {
XmlElementInfo wraperElement = schemaInfo.elements.get(wrapperName);
XmlTypeInfo wrapperType = schemaInfo.types.get(wraperElement.xmlType);
- Set<String> expectedOutParams = new HashSet<String>();
+ Set<String> expectedOutParams = new HashSet<>();
for (XmlElementInfo expectedOutParam : wrapperType.elements.values()) {
expectedOutParams.add(expectedOutParam.qname.getLocalPart());
}
@@ -254,7 +254,7 @@ public class HeavyweightOperationInfoBuilder {
XmlElementInfo wrapperElement = schemaInfo.elements.get(wrapperName);
XmlTypeInfo wrapperType = schemaInfo.types.get(wrapperElement.xmlType);
- Set<String> expectedInParams = new HashSet<String>();
+ Set<String> expectedInParams = new HashSet<>();
for (XmlElementInfo expectedInParam : wrapperType.elements.values()) {
expectedInParams.add(expectedInParam.qname.getLocalPart());
}
@@ -413,9 +413,9 @@ public class HeavyweightOperationInfoBuilder {
if (mode == Mode.IN) {
// IN only prarmeters don't have holders
paramJavaType = paramMapping.getParamType();
- } else if (rpcHolderClasses.containsKey(paramMapping.getParamType())) {
+ } else if (RPC_HOLDER_CLASSES.containsKey(paramMapping.getParamType())) {
// This is a standard type with a built in holder class
- paramJavaType = rpcHolderClasses.get(paramMapping.getParamType());
+ paramJavaType = RPC_HOLDER_CLASSES.get(paramMapping.getParamType());
} else {
// holderClass == ${packageName}.holders.${typeName}Holder
String packageName;
@@ -571,7 +571,7 @@ public class HeavyweightOperationInfoBuilder {
throw new OpenEJBException("ConstructorParameterOrder can only be set for complex types, not " + faultTypeInfo.qname);
}
- Map<String, XmlElementInfo> elements = new HashMap<String, XmlElementInfo>();
+ Map<String, XmlElementInfo> elements = new HashMap<>();
for (XmlElementInfo element : faultTypeInfo.elements.values()) {
elements.put(element.qname.getLocalPart(), element);
}
@@ -598,7 +598,7 @@ public class HeavyweightOperationInfoBuilder {
}
// if we don't have a java type yet, check the simple types
if (paramJavaType == null) {
- paramJavaType = qnameToJavaType.get(paramElementInfo.xmlType);
+ paramJavaType = QNAME_TO_JAVA_TYPE.get(paramElementInfo.xmlType);
}
if (paramJavaType == null) {
throw new OpenEJBException("No class mapped for element type: " + paramElementInfo.xmlType);
@@ -661,30 +661,30 @@ public class HeavyweightOperationInfoBuilder {
}
//see jaxrpc 1.1 4.2.1
- private static final Map<QName, String> qnameToJavaType = new HashMap<QName, String>();
+ private static final Map<QName, String> QNAME_TO_JAVA_TYPE = new HashMap<QName, String>();
static {
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "string"), String.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "integer"), BigInteger.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "int"), int.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "long"), long.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "short"), short.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "decimal"), BigDecimal.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "float"), float.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "double"), double.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "byte"), byte.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedInt"), long.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedShort"), int.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedByte"), short.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "QName"), QName.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "dateTime"), Calendar.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "date"), Calendar.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "time"), Calendar.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "anyURI"), URI.class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "base64Binary"), byte[].class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "hexBinary"), byte[].class.getName());
- qnameToJavaType.put(new QName("http://www.w3.org/2001/XMLSchema", "anySimpleType"), String.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "string"), String.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "integer"), BigInteger.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "int"), int.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "long"), long.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "short"), short.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "decimal"), BigDecimal.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "float"), float.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "double"), double.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "boolean"), boolean.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "byte"), byte.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedInt"), long.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedShort"), int.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "unsignedByte"), short.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "QName"), QName.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "dateTime"), Calendar.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "date"), Calendar.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "time"), Calendar.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "anyURI"), URI.class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "base64Binary"), byte[].class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "hexBinary"), byte[].class.getName());
+ QNAME_TO_JAVA_TYPE.put(new QName("http://www.w3.org/2001/XMLSchema", "anySimpleType"), String.class.getName());
}
@@ -700,29 +700,29 @@ public class HeavyweightOperationInfoBuilder {
*/
// standard holder classes by type
- private static final Map<String, String> rpcHolderClasses = new HashMap<String, String>();
+ private static final Map<String, String> RPC_HOLDER_CLASSES = new HashMap<String, String>();
static {
- rpcHolderClasses.put(BigDecimal.class.getName(), BigDecimalHolder.class.getName());
- rpcHolderClasses.put(BigInteger.class.getName(), BigIntegerHolder.class.getName());
- rpcHolderClasses.put(boolean.class.getName(), BooleanHolder.class.getName());
- rpcHolderClasses.put(Boolean.class.getName(), BooleanWrapperHolder.class.getName());
- rpcHolderClasses.put(byte[].class.getName(), ByteArrayHolder.class.getName());
- rpcHolderClasses.put(byte.class.getName(), ByteHolder.class.getName());
- rpcHolderClasses.put(Byte.class.getName(), ByteWrapperHolder.class.getName());
- rpcHolderClasses.put(Calendar.class.getName(), CalendarHolder.class.getName());
- rpcHolderClasses.put(double.class.getName(), DoubleHolder.class.getName());
- rpcHolderClasses.put(Double.class.getName(), DoubleWrapperHolder.class.getName());
- rpcHolderClasses.put(float.class.getName(), FloatHolder.class.getName());
- rpcHolderClasses.put(Float.class.getName(), FloatWrapperHolder.class.getName());
- rpcHolderClasses.put(int.class.getName(), IntHolder.class.getName());
- rpcHolderClasses.put(Integer.class.getName(), IntegerWrapperHolder.class.getName());
- rpcHolderClasses.put(long.class.getName(), LongHolder.class.getName());
- rpcHolderClasses.put(Long.class.getName(), LongWrapperHolder.class.getName());
- rpcHolderClasses.put(Object.class.getName(), ObjectHolder.class.getName());
- rpcHolderClasses.put(QName.class.getName(), QNameHolder.class.getName());
- rpcHolderClasses.put(short.class.getName(), ShortHolder.class.getName());
- rpcHolderClasses.put(Short.class.getName(), ShortWrapperHolder.class.getName());
- rpcHolderClasses.put(String.class.getName(), StringHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(BigDecimal.class.getName(), BigDecimalHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(BigInteger.class.getName(), BigIntegerHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(boolean.class.getName(), BooleanHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Boolean.class.getName(), BooleanWrapperHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(byte[].class.getName(), ByteArrayHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(byte.class.getName(), ByteHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Byte.class.getName(), ByteWrapperHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Calendar.class.getName(), CalendarHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(double.class.getName(), DoubleHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Double.class.getName(), DoubleWrapperHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(float.class.getName(), FloatHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Float.class.getName(), FloatWrapperHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(int.class.getName(), IntHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Integer.class.getName(), IntegerWrapperHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(long.class.getName(), LongHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Long.class.getName(), LongWrapperHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Object.class.getName(), ObjectHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(QName.class.getName(), QNameHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(short.class.getName(), ShortHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(Short.class.getName(), ShortWrapperHolder.class.getName());
+ RPC_HOLDER_CLASSES.put(String.class.getName(), StringHolder.class.getName());
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
index 1b1cbbf..d85596d 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/HeavyweightTypeInfoBuilder.java
@@ -46,7 +46,7 @@ public class HeavyweightTypeInfoBuilder {
private static final String SOAP_ENCODING_NS = "http://schemas.xmlsoap.org/soap/encoding/";
private static final String XML_SCHEMA_NS = "http://www.w3.org/2001/XMLSchema";
- private static final Log log = LogFactory.getLog(HeavyweightTypeInfoBuilder.class);
+ private static final Log LOG = LogFactory.getLog(HeavyweightTypeInfoBuilder.class);
private final JavaWsdlMapping mapping;
private final ClassLoader classLoader;
@@ -65,9 +65,9 @@ public class HeavyweightTypeInfoBuilder {
}
public List<JaxRpcTypeInfo> buildTypeInfo() throws OpenEJBException {
- List<JaxRpcTypeInfo> typeInfos = new ArrayList<JaxRpcTypeInfo>();
+ List<JaxRpcTypeInfo> typeInfos = new ArrayList<>();
- Set<QName> mappedTypeQNames = new HashSet<QName>();
+ Set<QName> mappedTypeQNames = new HashSet<>();
//
// Map types with explicity Java to XML mappings
@@ -108,7 +108,7 @@ public class HeavyweightTypeInfoBuilder {
if ("element".equals(javaXmlTypeMapping.getQNameScope())) {
XmlElementInfo elementInfo = schemaInfo.elements.get(qname);
if (elementInfo == null) {
- log.warn("Element [" + qname + "] not been found in schema, known elements: " + schemaInfo.elements.keySet());
+ LOG.warn("Element [" + qname + "] not been found in schema, known elements: " + schemaInfo.elements.keySet());
}
xmlTypeQName = elementInfo.xmlType;
} else {
@@ -119,10 +119,10 @@ public class HeavyweightTypeInfoBuilder {
XmlTypeInfo xmlTypeInfo = schemaInfo.types.get(xmlTypeQName);
if (xmlTypeInfo == null) {
// if this is a built in type then assume this is a redundant mapping
- if (WebserviceNameSpaces.contains(xmlTypeInfo.qname.getNamespaceURI())) {
+ if (WEBSERVICE_NAMESPACES.contains(xmlTypeInfo.qname.getNamespaceURI())) {
continue;
}
- log.warn("Schema type QName [" + qname + "] not been found in schema: " + schemaInfo.types.keySet());
+ LOG.warn("Schema type QName [" + qname + "] not been found in schema: " + schemaInfo.types.keySet());
continue;
}
@@ -148,7 +148,7 @@ public class HeavyweightTypeInfoBuilder {
// Map types used in operations
//
for (JaxRpcOperationInfo operationInfo : operations) {
- List<JaxRpcParameterInfo> parameters = new ArrayList<JaxRpcParameterInfo>(operationInfo.parameters);
+ List<JaxRpcParameterInfo> parameters = new ArrayList<>(operationInfo.parameters);
// add the return type to the parameters so it is processed below
if (operationInfo.returnXmlType != null) {
@@ -173,7 +173,7 @@ public class HeavyweightTypeInfoBuilder {
// get the xml type info
XmlTypeInfo xmlTypeInfo = schemaInfo.types.get(xmlType);
if (xmlTypeInfo == null) {
- log.warn("Type QName [" + xmlType + "] defined by operation [" + operationInfo + "] has not been found in schema: " + schemaInfo.types.keySet());
+ LOG.warn("Type QName [" + xmlType + "] defined by operation [" + operationInfo + "] has not been found in schema: " + schemaInfo.types.keySet());
continue;
}
mappedTypeQNames.add(xmlTypeInfo.qname);
@@ -190,7 +190,7 @@ public class HeavyweightTypeInfoBuilder {
if (xmlTypeInfo.simpleBaseType == null && !clazz.isArray()) {
if (!mappedTypeQNames.contains(xmlTypeInfo.qname)) {
// TODO: this lookup is not enough: the jaxrpc mapping file may define an anonymous mapping
- log.warn("Operation " + operationInfo.name + "] uses XML type [" + xmlTypeInfo + "], whose mapping is not declared by the jaxrpc mapping file.\n Continuing deployment; " + "yet, the deployment is not-portable.");
+ LOG.warn("Operation " + operationInfo.name + "] uses XML type [" + xmlTypeInfo + "], whose mapping is not declared by the jaxrpc mapping file.\n Continuing deployment; " + "yet, the deployment is not-portable.");
}
continue;
}
@@ -250,15 +250,15 @@ public class HeavyweightTypeInfoBuilder {
private void mapFields(Class javaClass, XmlTypeInfo xmlTypeInfo, JavaXmlTypeMapping javaXmlTypeMapping, JaxRpcTypeInfo typeInfo) throws OpenEJBException {
// Skip arrays since they can't define a variable-mapping element
if (!javaClass.isArray()) {
- // if there is a variable-mapping, log a warning
+ // if there is a variable-mapping, LOG a warning
if (!javaXmlTypeMapping.getVariableMapping().isEmpty()) {
- log.warn("Ignoring variable-mapping defined for class " + javaClass + " which is an array.");
+ LOG.warn("Ignoring variable-mapping defined for class " + javaClass + " which is an array.");
}
return;
}
// Index Java bean properties by name
- Map<String, Class> properties = new HashMap<String, Class>();
+ Map<String, Class> properties = new HashMap<>();
try {
PropertyDescriptor[] propertyDescriptors = Introspector.getBeanInfo(javaClass).getPropertyDescriptors();
for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
@@ -350,7 +350,7 @@ public class HeavyweightTypeInfoBuilder {
/**
* All of the known built in XML Schemas used by webservices. This is used to supress unknown type exceptions
*/
- private static final Set<String> WebserviceNameSpaces = Collections.unmodifiableSet(new LinkedHashSet<String>(Arrays.asList(
+ private static final Set<String> WEBSERVICE_NAMESPACES = Collections.unmodifiableSet(new LinkedHashSet<String>(Arrays.asList(
"http://schemas.xmlsoap.org/soap/encoding/", // SOAP 1.1
"http://www.w3.org/2003/05/soap-encoding", // SOAP 1.2
"http://xml.apache.org/xml-soap", // Apache XMLSOAP
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
index 2f19650..dca67ac 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcFaultInfo.java
@@ -26,5 +26,5 @@ public class JaxRpcFaultInfo {
public QName xmlType;
public String javaType;
public boolean complex;
- public List<JaxRpcParameterInfo> parameters = new ArrayList<JaxRpcParameterInfo>();
+ public List<JaxRpcParameterInfo> parameters = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
index 580748a..5b86a47 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcOperationInfo.java
@@ -30,13 +30,13 @@ public class JaxRpcOperationInfo {
public String javaMethodName;
- public List<JaxRpcParameterInfo> parameters = new ArrayList<JaxRpcParameterInfo>();
+ public List<JaxRpcParameterInfo> parameters = new ArrayList<>();
public QName returnQName;
public QName returnXmlType;
public String returnJavaType;
- public Collection<JaxRpcFaultInfo> faults = new ArrayList<JaxRpcFaultInfo>();
+ public Collection<JaxRpcFaultInfo> faults = new ArrayList<>();
public static enum OperationStyle {
ONE_WAY, REQUEST_RESPONSE, SOLICIT_RESPONSE, NOTIFICATION
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
index ee6f763..58a678b 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfo.java
@@ -27,6 +27,6 @@ public class JaxRpcServiceInfo {
public String serviceEndpointInterface;
public BindingStyle defaultBindingStyle;
- public final Collection<JaxRpcOperationInfo> operations = new ArrayList<JaxRpcOperationInfo>();
- public final Collection<JaxRpcTypeInfo> types = new ArrayList<JaxRpcTypeInfo>();
+ public final Collection<JaxRpcOperationInfo> operations = new ArrayList<>();
+ public final Collection<JaxRpcTypeInfo> types = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
index c503982..77b6cba 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcServiceInfoBuilder.java
@@ -96,7 +96,7 @@ public class JaxRpcServiceInfoBuilder {
}
private Set<QName> buildOperations(Binding binding, Class serviceEndpointInterface, boolean lightweight) throws OpenEJBException {
- Set<QName> wrappedElementQNames = new HashSet<QName>();
+ Set<QName> wrappedElementQNames = new HashSet<>();
for (Object op : binding.getBindingOperations()) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
index c64a090..52744c1 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/JaxRpcTypeInfo.java
@@ -34,7 +34,7 @@ public class JaxRpcTypeInfo {
public SerializerType serializerType;
public QName componentType;
- public final Collection<JaxRpcFieldInfo> fields = new ArrayList<JaxRpcFieldInfo>();
+ public final Collection<JaxRpcFieldInfo> fields = new ArrayList<>();
public static enum SerializerType {
ARRAY, ENUM, LIST, OTHER
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
index 3238a88..059bd38 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/LightweightTypeInfoBuilder.java
@@ -42,7 +42,7 @@ public class LightweightTypeInfoBuilder {
}
public List<JaxRpcTypeInfo> buildTypeInfo() throws OpenEJBException {
- List<JaxRpcTypeInfo> typeInfoList = new ArrayList<JaxRpcTypeInfo>();
+ List<JaxRpcTypeInfo> typeInfoList = new ArrayList<>();
for (XmlTypeInfo xmlTypeInfo : schemaInfo.types.values()) {
// skip anonymous elements
@@ -72,7 +72,7 @@ public class LightweightTypeInfoBuilder {
private void mapFields(Class javaClass, XmlTypeInfo xmlTypeInfo, JaxRpcTypeInfo typeInfo) throws OpenEJBException {
// Map JavaBean property name to propertyType
- Map<String, Class> propertyToClass = new HashMap<String, Class>();
+ Map<String, Class> propertyToClass = new HashMap<>();
try {
for (PropertyDescriptor descriptor : Introspector.getBeanInfo(javaClass).getPropertyDescriptors()) {
propertyToClass.put(descriptor.getName(), descriptor.getPropertyType());
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
index 075e84d..64fdd24 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlSchemaInfo.java
@@ -24,6 +24,6 @@ import java.util.LinkedHashMap;
import java.util.Map;
public class XmlSchemaInfo extends InfoObject {
- public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<QName, XmlElementInfo>();
- public final Map<QName, XmlTypeInfo> types = new LinkedHashMap<QName, XmlTypeInfo>();
+ public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<>();
+ public final Map<QName, XmlTypeInfo> types = new LinkedHashMap<>();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
index 8adaa82..ebafdd0 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/assembler/XmlTypeInfo.java
@@ -32,6 +32,6 @@ public class XmlTypeInfo extends InfoObject {
public boolean listType;
public QName arrayComponentType;
- public final Map<String, QName> attributes = new LinkedHashMap<String, QName>();
- public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<QName, XmlElementInfo>();
+ public final Map<String, QName> attributes = new LinkedHashMap<>();
+ public final Map<QName, XmlElementInfo> elements = new LinkedHashMap<>();
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
index 7387a94..9536612 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ArrayTypeInfo.java
@@ -41,6 +41,11 @@ public class ArrayTypeInfo extends TypeInfo {
this.componentQName = componentQName;
}
+ /**
+ *
+ * @param typeMapping TypeMapping
+ */
+ @Override
public void register(TypeMapping typeMapping) {
// SerializerFactory ser = BaseSerializerFactory.createFactory(getSerFactoryClass(), getClazz(), getqName());
// ((ArraySerializerFactory)ser).setComponentType(componentType);
@@ -58,6 +63,11 @@ public class ArrayTypeInfo extends TypeInfo {
private QName componentType;
private QName componentQName;
+ /**
+ *
+ * @return TypeInfo
+ */
+ @Override
public TypeInfo buildTypeInfo() {
if (null == clazz) {
throw new IllegalStateException("clazz is null");
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
index 53b342b..b9e65bc 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisClientImpl.java
@@ -33,6 +33,12 @@ public class AxisClientImpl extends AxisClient {
this.portNameToSEIFactoryMap = portNameToSEIFactoryMap;
}
+ /**
+ *
+ * @param context MessageContext
+ * @return HandlerChain
+ */
+ @Override
protected HandlerChain getJAXRPChandlerChain(MessageContext context) {
QName portQName = (QName) context.getProperty(Call.WSDL_PORT_NAME);
if (portQName == null) {
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
index a1ca43f..8c7ae98 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/AxisServiceReference.java
@@ -53,6 +53,12 @@ public class AxisServiceReference extends Reference {
this.classLoader = classLoader;
}
+ /**
+ *
+ * @return Object
+ * @throws NamingException
+ */
+ @Override
public Object getObject() throws NamingException {
Object serviceInstance = createServiceInterfaceProxy(serviceInterfaceClassName, seiPortNameToFactoryMap, seiClassNameToFactoryMap, classLoader);
return serviceInstance;
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
index 9f67e43..b8d71b5 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/GenericServiceEndpointWrapper.java
@@ -31,10 +31,12 @@ public class GenericServiceEndpointWrapper implements Stub {
this.genericServiceEndpoint = genericServiceEndpoint;
}
+ @Override
public void _setProperty(String s, Object o) {
genericServiceEndpoint._setProperty(s, o);
}
+ @Override
public Object _getProperty(String s) {
return genericServiceEndpoint._getProperty(s);
}
@@ -43,6 +45,7 @@ public class GenericServiceEndpointWrapper implements Stub {
return genericServiceEndpoint.removeProperty(s);
}
+ @Override
public Iterator _getPropertyNames() {
return genericServiceEndpoint._getPropertyNames();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
index efed7b6..fac5b02 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/NoOverrideCallbackFilter.java
@@ -28,6 +28,12 @@ public class NoOverrideCallbackFilter implements CallbackFilter {
this.superClass = superClass;
}
+ /**
+ *
+ * @param method Method
+ * @return int
+ */
+ @Override
public int accept(Method method) {
// we don't intercept non-public methods like finalize
if (!Modifier.isPublic(method.getModifiers())) {
@@ -47,6 +53,7 @@ public class NoOverrideCallbackFilter implements CallbackFilter {
}
}
+ @Override
public boolean equals(Object other) {
if (other == null) {
return false;
@@ -65,6 +72,7 @@ public class NoOverrideCallbackFilter implements CallbackFilter {
return superClass.equals(otherFilter.superClass);
}
+ @Override
public int hashCode() {
return superClass.hashCode();
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
index 71fb885..c24985d 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceEndpointMethodInterceptor.java
@@ -43,6 +43,16 @@ public class ServiceEndpointMethodInterceptor implements MethodInterceptor {
this.credentialsName = credentialsName;
}
+ /**
+ *
+ * @param o Object
+ * @param method Method
+ * @param objects Object[]
+ * @param methodProxy MethodProxy
+ * @return Object
+ * @throws Throwable
+ */
+ @Override
public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
SaajUniverse universe = new SaajUniverse();
universe.set(SaajUniverse.AXIS1);
http://git-wip-us.apache.org/repos/asf/tomee/blob/4bc58e97/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
----------------------------------------------------------------------
diff --git a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
index 2f58cda..b3e1e0e 100644
--- a/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
+++ b/server/openejb-axis/src/main/java/org/apache/openejb/server/axis/client/ServiceMethodInterceptor.java
@@ -30,6 +30,16 @@ public class ServiceMethodInterceptor implements MethodInterceptor {
this.seiFactoryMap = seiFactoryMap;
}
+ /**
+ *
+ * @param o Object
+ * @param method Method
+ * @param objects Object[]
+ * @param methodProxy MethodProxy
+ * @return Object
+ * @throws Throwable
+ */
+ @Override
public Object intercept(Object o, Method method, Object[] objects, MethodProxy methodProxy) throws Throwable {
if (objects.length == 0) {
String methodName = method.getName();
[05/12] tomee git commit: usage diamond operator
Posted by jl...@apache.org.
usage diamond operator
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/5744022f
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/5744022f
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/5744022f
Branch: refs/heads/master
Commit: 5744022f0e0544f1b4cd0845ccf504360b2059d5
Parents: f228013
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 19:41:14 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 19:41:14 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/server/admin/Stop.java | 6 +++---
.../apache/openejb/server/auth/ExactIPAddressPermission.java | 1 +
.../apache/openejb/server/auth/ExactIPv6AddressPermission.java | 1 +
.../openejb/server/auth/FactorizedIPAddressPermission.java | 1 +
.../apache/openejb/server/auth/IPAddressPermissionEditor.java | 2 ++
.../apache/openejb/server/auth/NetmaskIPAddressPermission.java | 1 +
.../openejb/server/auth/NetmaskIPv6AddressPermission.java | 1 +
.../org/apache/openejb/server/auth/PermitAllPermission.java | 1 +
.../openejb/server/auth/StartWithIPAddressPermission.java | 1 +
.../main/java/org/apache/openejb/server/osgi/Activator.java | 2 ++
.../org/apache/openejb/server/osgi/ServiceManagerExtender.java | 6 +++---
.../org/apache/openejb/server/stream/CountingOutputStream.java | 2 ++
12 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java b/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
index 68f1c73..fda3b95 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/admin/Stop.java
@@ -30,7 +30,7 @@ import java.util.Properties;
@SuppressWarnings("UseOfSystemOutOrSystemErr")
public class Stop {
- private static final String helpBase = "META-INF/org.apache.openejb.cli/";
+ private static final String HELP_BASE = "META-INF/org.apache.openejb.cli/";
public static void stop(final String host, final int port) {
@@ -116,7 +116,7 @@ public class Stop {
InputStream in = null;
try {
- final URL resource = Thread.currentThread().getContextClassLoader().getResource(helpBase + "stop.help");
+ final URL resource = Thread.currentThread().getContextClassLoader().getResource(HELP_BASE + "stop.help");
if (resource != null) {
in = resource.openConnection().getInputStream();
@@ -151,7 +151,7 @@ public class Stop {
System.out.println(header);
InputStream in = null;
try {
- final URL resource = Thread.currentThread().getContextClassLoader().getResource(helpBase + "stop.examples");
+ final URL resource = Thread.currentThread().getContextClassLoader().getResource(HELP_BASE + "stop.examples");
if (resource != null) {
in = resource.openConnection().getInputStream();
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
index dc226b1..5bb280b 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPAddressPermission.java
@@ -56,6 +56,7 @@ public class ExactIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
index ceb3fb0..f0a6aa2 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/ExactIPv6AddressPermission.java
@@ -57,6 +57,7 @@ public class ExactIPv6AddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet6Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
index 0c32605..95b41ed 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/FactorizedIPAddressPermission.java
@@ -82,6 +82,7 @@ public class FactorizedIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
index 58d28d0..dce82a8 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/IPAddressPermissionEditor.java
@@ -25,10 +25,12 @@ import java.beans.PropertyEditorSupport;
public class IPAddressPermissionEditor extends PropertyEditorSupport {
private IPAddressPermission addressMask;
+ @Override
public void setAsText(final String text) throws IllegalArgumentException {
addressMask = IPAddressPermissionFactory.getIPAddressMask(text);
}
+ @Override
public Object getValue() {
return addressMask;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
index 69b54e0..ba60942 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPAddressPermission.java
@@ -74,6 +74,7 @@ public class NetmaskIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
index 8d1f1e9..2854454 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/NetmaskIPv6AddressPermission.java
@@ -75,6 +75,7 @@ public class NetmaskIPv6AddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet6Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
index 18ca892..0a2c20b 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/PermitAllPermission.java
@@ -22,6 +22,7 @@ import java.net.InetAddress;
* @version $Rev$ $Date$
*/
public class PermitAllPermission implements IPAddressPermission {
+ @Override
public boolean implies(InetAddress address) {
return true;
}
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
index af9d831..063cb0f 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/auth/StartWithIPAddressPermission.java
@@ -66,6 +66,7 @@ public class StartWithIPAddressPermission implements IPAddressPermission {
}
}
+ @Override
public boolean implies(InetAddress address) {
if (false == address instanceof Inet4Address) {
return false;
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
index 992f437..2871524 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/Activator.java
@@ -29,11 +29,13 @@ public class Activator implements BundleActivator {
private ServiceManagerExtender manager;
private ServiceRegistration registration;
+ @Override
public void start(final BundleContext bundleContext) throws Exception {
manager = new ServiceManagerExtender(bundleContext);
registration = bundleContext.registerService(ServiceManager.class.getName(), manager, null);
}
+ @Override
public void stop(final BundleContext bundleContext) throws Exception {
if (manager != null) {
manager.shutdown();
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
index 39549c6..3f18ab4 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/osgi/ServiceManagerExtender.java
@@ -50,7 +50,7 @@ public class ServiceManagerExtender extends ServiceManager {
private final BundleContext bundleContext;
private BundleTracker tracker;
- private final Map<Bundle, List<Service>> serverMap = new HashMap<Bundle, List<Service>>();
+ private final Map<Bundle, List<Service>> serverMap = new HashMap<>();
private Boolean started;
private volatile boolean stopped = false;
@@ -105,7 +105,7 @@ public class ServiceManagerExtender extends ServiceManager {
}
protected void addedServers(final Bundle bundle, final Map<String, Properties> resources) {
- final List<Service> services = new ArrayList<Service>();
+ final List<Service> services = new ArrayList<>();
for (final Map.Entry<String, Properties> entry : resources.entrySet()) {
services.add(new Service(bundle, entry.getKey(), entry.getValue()));
}
@@ -225,7 +225,7 @@ public class ServiceManagerExtender extends ServiceManager {
final String basePath = "/META-INF/" + ServerService.class.getName() + "/";
final Enumeration<URL> entries = bundle.findEntries(basePath, "*", false);
if (entries != null) {
- final Map<String, Properties> resources = new HashMap<String, Properties>();
+ final Map<String, Properties> resources = new HashMap<>();
while (entries.hasMoreElements()) {
final URL entry = entries.nextElement();
final String name = entry.getPath().substring(basePath.length());
http://git-wip-us.apache.org/repos/asf/tomee/blob/5744022f/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
----------------------------------------------------------------------
diff --git a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
index 2b63b5f..9b6da4a 100644
--- a/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
+++ b/server/openejb-server/src/main/java/org/apache/openejb/server/stream/CountingOutputStream.java
@@ -46,10 +46,12 @@ public class CountingOutputStream extends FilterOutputStream {
super.write(b, off, len);
}
+ @Override
public void flush() throws IOException {
out.flush();
}
+ @Override
public void close() throws IOException {
out.close();
}
[12/12] tomee git commit: This closes apache/tomee#231
Posted by jl...@apache.org.
This closes apache/tomee#231
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/c165b238
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/c165b238
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/c165b238
Branch: refs/heads/master
Commit: c165b2389de4f14dd1b9e468a97b1cde1efa3f7a
Parents: 0bd2435 8d4badf
Author: Jean-Louis Monteiro <je...@gmail.com>
Authored: Wed Dec 5 13:40:25 2018 +0100
Committer: Jean-Louis Monteiro <je...@gmail.com>
Committed: Wed Dec 5 13:40:25 2018 +0100
----------------------------------------------------------------------
.../apache/openejb/server/axis/AxisService.java | 8 +-
.../openejb/server/axis/AxisWsContainer.java | 17 +-
.../openejb/server/axis/EjbRpcProvider.java | 22 +-
.../openejb/server/axis/PojoProvider.java | 21 ++
.../server/axis/ReadOnlyServiceDesc.java | 208 +++++++++++++++++++
.../assembler/CommonsSchemaInfoBuilder.java | 14 +-
.../axis/assembler/CommonsSchemaLoader.java | 11 +-
.../HeavyweightOperationInfoBuilder.java | 112 +++++-----
.../assembler/HeavyweightTypeInfoBuilder.java | 26 +--
.../server/axis/assembler/JaxRpcFaultInfo.java | 2 +-
.../axis/assembler/JaxRpcOperationInfo.java | 4 +-
.../axis/assembler/JaxRpcServiceInfo.java | 4 +-
.../assembler/JaxRpcServiceInfoBuilder.java | 2 +-
.../server/axis/assembler/JaxRpcTypeInfo.java | 2 +-
.../assembler/LightweightTypeInfoBuilder.java | 4 +-
.../server/axis/assembler/XmlSchemaInfo.java | 4 +-
.../server/axis/assembler/XmlTypeInfo.java | 4 +-
.../server/axis/client/ArrayTypeInfo.java | 10 +
.../server/axis/client/AxisClientImpl.java | 6 +
.../axis/client/AxisServiceReference.java | 6 +
.../client/GenericServiceEndpointWrapper.java | 3 +
.../axis/client/NoOverrideCallbackFilter.java | 8 +
.../ServiceEndpointMethodInterceptor.java | 10 +
.../axis/client/ServiceMethodInterceptor.java | 10 +
.../server/cli/command/ClassLoaderCommand.java | 2 +-
.../server/cli/command/DeployedAppCommand.java | 2 +-
.../org/apache/openejb/daemon/NTService.java | 9 +-
.../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 +-
.../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 +-
.../apache/openejb/server/DiscoveryAgent.java | 2 +
.../openejb/server/DiscoveryListener.java | 1 -
.../openejb/server/DiscoveryRegistry.java | 14 +-
.../openejb/server/FilteredServiceManager.java | 2 +-
.../java/org/apache/openejb/server/Main.java | 1 -
.../openejb/server/ServiceAccessController.java | 4 +-
.../apache/openejb/server/ServiceDaemon.java | 18 +-
.../apache/openejb/server/ServiceManager.java | 2 +-
.../java/org/apache/openejb/server/Start.java | 2 +-
.../org/apache/openejb/server/admin/Stop.java | 6 +-
.../server/auth/ExactIPAddressPermission.java | 1 +
.../server/auth/ExactIPv6AddressPermission.java | 1 +
.../auth/FactorizedIPAddressPermission.java | 1 +
.../server/auth/IPAddressPermissionEditor.java | 2 +
.../server/auth/NetmaskIPAddressPermission.java | 1 +
.../auth/NetmaskIPv6AddressPermission.java | 1 +
.../server/auth/PermitAllPermission.java | 1 +
.../auth/StartWithIPAddressPermission.java | 1 +
.../apache/openejb/server/osgi/Activator.java | 2 +
.../server/osgi/ServiceManagerExtender.java | 6 +-
.../server/stream/CountingOutputStream.java | 2 +
.../LightWeightMappingValidator.java | 12 +-
.../openejb/server/webservices/WsService.java | 71 +++----
.../openejb/server/webservices/WsServlet.java | 27 ++-
.../openejb/server/webservices/WsdlVisitor.java | 4 +-
.../webservices/saaj/MessageFactoryImpl.java | 2 +
.../webservices/saaj/SaajFactoryFinder.java | 10 +-
.../webservices/saaj/SaajMetaFactoryImpl.java | 2 +
.../server/webservices/saaj/SaajUniverse.java | 8 +-
.../saaj/SoapConnectionFactoryImpl.java | 1 +
.../webservices/saaj/SoapFactoryImpl.java | 8 +
.../org/apache/tomee/common/NamingUtil.java | 12 +-
.../org/apache/tomee/installer/Installer.java | 18 +-
75 files changed, 703 insertions(+), 321 deletions(-)
----------------------------------------------------------------------
[11/12] tomee git commit: fix merge conflict
Posted by jl...@apache.org.
fix merge conflict
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8d4badff
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8d4badff
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8d4badff
Branch: refs/heads/master
Commit: 8d4badffd5896e41d010be2f88d9d76886bb302e
Parents: 4bc58e9
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Tue Dec 4 17:54:55 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Tue Dec 4 17:54:55 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/server/DiscoveryAgent.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/8d4badff/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 6aa04d2..83e09c5 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
- * @throws java.io.IOException
+ * @throws IOException
*/
void registerService(URI serviceUri) throws IOException;
@@ -42,7 +42,7 @@ public interface DiscoveryAgent {
* register a service
*
* @param serviceUri
- * @throws java.io.IOException
+ * @throws IOException
*/
void unregisterService(URI serviceUri) throws IOException;
[09/12] tomee git commit: openejb-daemon: remove unused import
Posted by jl...@apache.org.
openejb-daemon: remove unused import
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d27842c4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d27842c4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d27842c4
Branch: refs/heads/master
Commit: d27842c4bf6e81b9e4497e0fb002d9f950657f3e
Parents: 8734925
Author: Hayri Cicek <ha...@kodnito.com>
Authored: Mon Dec 3 20:33:59 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
Committed: Mon Dec 3 20:33:59 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/openejb/daemon/NTService.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/d27842c4/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java
----------------------------------------------------------------------
diff --git a/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java b/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java
index 5be681a..53e2282 100644
--- a/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java
+++ b/server/openejb-daemon/src/main/java/org/apache/openejb/daemon/NTService.java
@@ -19,7 +19,6 @@ package org.apache.openejb.daemon;
import org.apache.openejb.cli.Bootstrap;
import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.server.Server;
-import org.apache.openejb.server.ServerRuntimeException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -27,7 +26,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
public class NTService {
- private static final NTService instance = new NTService();
+ private static final NTService INSTANCE = new NTService();
private final AtomicBoolean running = new AtomicBoolean(false);
/**
@@ -37,7 +36,7 @@ public class NTService {
*/
public static void start(final String[] args) {
try {
- instance.startImpl(args);
+ INSTANCE.startImpl(args);
} catch (Throwable e) {
e.printStackTrace(System.err);
}
@@ -50,7 +49,7 @@ public class NTService {
*/
public static void stop(final String[] args) {
try {
- instance.stopImpl();
+ INSTANCE.stopImpl();
} catch (Throwable e) {
e.printStackTrace(System.err);
}
@@ -70,7 +69,7 @@ public class NTService {
System.setProperty("openejb.home", System.getProperty("user.dir"));
}
- final ArrayList<String> list = new ArrayList<String>();
+ final ArrayList<String> list = new ArrayList<>();
list.addAll(Arrays.asList(args));
if (!list.contains("start")) {
[06/12] tomee git commit: openejb-multicast: usage of dimaond operator
Posted by jl...@apache.org.
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 <ha...@kodnito.com>
Authored: Mon Dec 3 19:53:34 2018 +0100
Committer: Hayri Cicek <ha...@kodnito.com>
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");