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 <[email protected]> Authored: Mon Dec 3 19:19:31 2018 +0100 Committer: Hayri Cicek <[email protected]> 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); }
