tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject [1/3] tomee git commit: final parameters
Date Mon, 03 Dec 2018 03:23:32 GMT
Repository: tomee
Updated Branches:
  refs/heads/master bdee81d34 -> 85a226f39


final parameters


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/91f75ad3
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/91f75ad3
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/91f75ad3

Branch: refs/heads/master
Commit: 91f75ad342df44ca06fea53452a10340431a4859
Parents: 6ba7fc5
Author: Hayri Cicek <hayricicek@Hayris-MBP.lan>
Authored: Wed Sep 12 22:43:26 2018 +0200
Committer: Hayri Cicek <hayricicek@Hayris-MBP.lan>
Committed: Wed Sep 12 22:43:26 2018 +0200

----------------------------------------------------------------------
 .../openejb/assembler/classic/AppInfo.java      | 34 ++++++++++----------
 .../openejb/assembler/classic/WebAppInfo.java   | 24 +++++++-------
 .../openejb/server/rest/EJBRestServiceInfo.java |  2 +-
 .../rest/OpenEJBRestRuntimeException.java       |  2 +-
 .../apache/openejb/server/rest/RESTService.java |  2 +-
 .../apache/openejb/server/rest/RsRegistry.java  |  1 -
 .../openejb/server/rest/RsRegistryImpl.java     |  4 ++-
 .../apache/openejb/server/rest/RsServlet.java   |  2 ++
 8 files changed, 37 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java
index 6481792..f5dfeb2 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/AppInfo.java
@@ -32,29 +32,29 @@ public class AppInfo extends InfoObject {
 
     public String appId;
     public String path;
-    public Set<String> paths = new LinkedHashSet<String>();
+    public Set<String> paths = new LinkedHashSet<>();
     public boolean autoDeploy = true;
     public boolean delegateFirst = true;
     public boolean standaloneModule;
-    public final List<ClientInfo> clients = new ArrayList<ClientInfo>();
-    public final List<EjbJarInfo> ejbJars = new ArrayList<EjbJarInfo>();
-    public final List<IdPropertiesInfo> pojoConfigurations = new ArrayList<IdPropertiesInfo>();
-    public final List<ConnectorInfo> connectors = new ArrayList<ConnectorInfo>();
-    public final List<WebAppInfo> webApps = new ArrayList<WebAppInfo>();
-    public final List<PersistenceUnitInfo> persistenceUnits = new ArrayList<PersistenceUnitInfo>();
-    public List<ServiceInfo> services = new ArrayList<ServiceInfo>();
-    public List<ContainerInfo> containers = new ArrayList<ContainerInfo>();
-    public final List<String> libs = new ArrayList<String>();
-    public final Set<String> watchedResources = new TreeSet<String>();
-    public final Set<String> resourceIds = new TreeSet<String>();
-    public final Set<String> resourceAliases = new TreeSet<String>();
+    public final List<ClientInfo> clients = new ArrayList<>();
+    public final List<EjbJarInfo> ejbJars = new ArrayList<>();
+    public final List<IdPropertiesInfo> pojoConfigurations = new ArrayList<>();
+    public final List<ConnectorInfo> connectors = new ArrayList<>();
+    public final List<WebAppInfo> webApps = new ArrayList<>();
+    public final List<PersistenceUnitInfo> persistenceUnits = new ArrayList<>();
+    public List<ServiceInfo> services = new ArrayList<>();
+    public List<ContainerInfo> containers = new ArrayList<>();
+    public final List<String> libs = new ArrayList<>();
+    public final Set<String> watchedResources = new TreeSet<>();
+    public final Set<String> resourceIds = new TreeSet<>();
+    public final Set<String> resourceAliases = new TreeSet<>();
     public final JndiEncInfo globalJndiEnc = new JndiEncInfo();
     public final JndiEncInfo appJndiEnc = new JndiEncInfo();
     public String cmpMappingsXml;
     public final Properties jmx = new Properties();
-    public final Set<String> mbeans = new TreeSet<String>();
-    public final Set<String> jaxRsProviders = new TreeSet<String>();
-    public final Set<String> jsfClasses = new TreeSet<String>();
-    public final Set<String> eventClassesNeedingAppClassloader = new TreeSet<String>();
+    public final Set<String> mbeans = new TreeSet<>();
+    public final Set<String> jaxRsProviders = new TreeSet<>();
+    public final Set<String> jsfClasses = new TreeSet<>();
+    public final Set<String> eventClassesNeedingAppClassloader = new TreeSet<>();
     public boolean webAppAlone;
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
index d9c950d..9dcdf3a 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/WebAppInfo.java
@@ -33,17 +33,17 @@ public class WebAppInfo extends CommonInfoObject {
     public String host;
     public String contextRoot;
     public int sessionTimeout;
-    public final Set<String> watchedResources = new TreeSet<String>();
-    public final Set<String> restClass = new TreeSet<String>();
-    public final Set<String> restApplications = new TreeSet<String>();
-    public final Set<String> ejbWebServices = new TreeSet<String>();
-    public final Set<String> ejbRestServices = new TreeSet<String>();
-    public final Set<ClassListInfo> webAnnotatedClasses = new LinkedHashSet<ClassListInfo>();
-    public final List<PortInfo> portInfos = new ArrayList<PortInfo>();
+    public final Set<String> watchedResources = new TreeSet<>();
+    public final Set<String> restClass = new TreeSet<>();
+    public final Set<String> restApplications = new TreeSet<>();
+    public final Set<String> ejbWebServices = new TreeSet<>();
+    public final Set<String> ejbRestServices = new TreeSet<>();
+    public final Set<ClassListInfo> webAnnotatedClasses = new LinkedHashSet<>();
+    public final List<PortInfo> portInfos = new ArrayList<>();
     public final JndiEncInfo jndiEnc = new JndiEncInfo();
-    public final List<ServletInfo> servlets = new ArrayList<ServletInfo>();
-    public final List<ClassListInfo> jsfAnnotatedClasses = new ArrayList<ClassListInfo>();
-    public final Set<String> jaxRsProviders = new TreeSet<String>();
-    public final List<ListenerInfo> listeners = new ArrayList<ListenerInfo>();
-    public final List<FilterInfo> filters = new ArrayList<FilterInfo>();
+    public final List<ServletInfo> servlets = new ArrayList<>();
+    public final List<ClassListInfo> jsfAnnotatedClasses = new ArrayList<>();
+    public final Set<String> jaxRsProviders = new TreeSet<>();
+    public final List<ListenerInfo> listeners = new ArrayList<>();
+    public final List<FilterInfo> filters = new ArrayList<>();
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/EJBRestServiceInfo.java
----------------------------------------------------------------------
diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/EJBRestServiceInfo.java
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/EJBRestServiceInfo.java
index 5ccfd8d..1d68961 100644
--- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/EJBRestServiceInfo.java
+++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/EJBRestServiceInfo.java
@@ -22,7 +22,7 @@ public class EJBRestServiceInfo {
     public String path;
     public BeanContext context;
 
-    public EJBRestServiceInfo(String path, BeanContext context) {
+    public EJBRestServiceInfo(final String path, final BeanContext context) {
         if (context == null) {
             throw new OpenEJBRestRuntimeException("can't find context");
         }

http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestRuntimeException.java
----------------------------------------------------------------------
diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestRuntimeException.java
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestRuntimeException.java
index 661a561..1d0210c 100644
--- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestRuntimeException.java
+++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/OpenEJBRestRuntimeException.java
@@ -21,7 +21,7 @@ public class OpenEJBRestRuntimeException extends RuntimeException {
         super(message);
     }
 
-    public OpenEJBRestRuntimeException(String message, Throwable cause) {
+    public OpenEJBRestRuntimeException(final String message, final Throwable cause) {
         super(message, cause);
     }
 }

http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
----------------------------------------------------------------------
diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
index f94f3fb..2474c0f 100644
--- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
+++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RESTService.java
@@ -302,7 +302,7 @@ public abstract class RESTService implements ServerService, SelfManaging
{
         }
     }
 
-    private void addAppProvidersIfNeeded(AppInfo appInfo, WebAppInfo webApp, ClassLoader
classLoader, Collection<Object> additionalProviders) {
+    private void addAppProvidersIfNeeded(final AppInfo appInfo, final WebAppInfo webApp,
final ClassLoader classLoader, final Collection<Object> additionalProviders) {
         if (useDiscoveredProviders(appInfo)) {
             final Set<String> jaxRsProviders = new HashSet<>(webApp.jaxRsProviders);
             jaxRsProviders.addAll(appInfo.jaxRsProviders);

http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java
----------------------------------------------------------------------
diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java
index f7dc13d..4254a79 100644
--- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java
+++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistry.java
@@ -19,7 +19,6 @@ package org.apache.openejb.server.rest;
 
 import org.apache.openejb.server.httpd.HttpListener;
 
-import java.util.List;
 
 public interface RsRegistry {
     AddressInfo createRsHttpListener(String appId, String webContext, HttpListener listener,
ClassLoader classLoader, String path, String virtualHost, String auth, String realm);

http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java
----------------------------------------------------------------------
diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java
index 211c6d6..0f5b2ff 100644
--- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java
+++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsRegistryImpl.java
@@ -29,7 +29,9 @@ public class RsRegistryImpl extends OpenEJBHttpRegistry implements RsRegistry
{
     private Map<String, String> addresses = new HashMap<String, String>();
 
     @Override
-    public AddressInfo createRsHttpListener(String appId, String webContext, HttpListener
listener, ClassLoader classLoader, String path, String virtualHost, String auth, String realm)
{
+    public AddressInfo createRsHttpListener(final String appId, final String webContext,

+            final HttpListener listener, final ClassLoader classLoader, final String path,

+            final String virtualHost, final String auth, final String realm) {
         final String address = HttpUtil.selectSingleAddress(getResolvedAddresses(path));
 
         if ("BASIC".equals(auth)) { // important to wrap with basic wrapper before classloader
wrapping

http://git-wip-us.apache.org/repos/asf/tomee/blob/91f75ad3/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java
----------------------------------------------------------------------
diff --git a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java
b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java
index 463ace9..2528d7a 100644
--- a/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java
+++ b/server/openejb-rest/src/main/java/org/apache/openejb/server/rest/RsServlet.java
@@ -34,6 +34,7 @@ public class RsServlet extends HttpServlet {
     private HttpListener listener;
     private ServletConfig servletConfig;
 
+    @Override
     public void init(ServletConfig config) throws ServletException {
         servletConfig = config;
         String listenerId = config.getInitParameter(HttpListener.class.getName());
@@ -42,6 +43,7 @@ public class RsServlet extends HttpServlet {
         }
     }
 
+    @Override
     public void service(HttpServletRequest req, HttpServletResponse res) throws ServletException,
IOException {
         if (listener == null) {
             throw new ServletException("RESTServiceContainer has not been set");


Mime
View raw message