You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/07/08 12:04:27 UTC
[tomcat] branch master updated (22acea9 -> 2edb9b0)
This is an automated email from the ASF dual-hosted git repository.
markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.
from 22acea9 Update checkstyle to 8.22
new 802caad Add a check, commented out by default, that helps when tidying up code
new 7d27aa9 Clean-up. Whitespace, braces
new cc90fc6 Simplify code. We already have the Service for this Context so use it.
new 2edb9b0 Use enhanced for-loops. Based on PR #177 by Govinda Sakhare.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/catalina/core/ApplicationContext.java | 105 +++++++++------------
res/checkstyle/checkstyle.xml | 9 +-
2 files changed, 52 insertions(+), 62 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 02/04: Clean-up. Whitespace, braces
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 7d27aa967306fbd0167d5c69faa267b40dd2ff66
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 8 10:10:22 2019 +0100
Clean-up. Whitespace, braces
---
.../apache/catalina/core/ApplicationContext.java | 94 +++++++++-------------
1 file changed, 39 insertions(+), 55 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index 87eab5a..fe70a32 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -180,8 +180,7 @@ public class ApplicationContext implements ServletContext {
/**
* The string manager for this package.
*/
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
+ private static final StringManager sm = StringManager.getManager(Constants.Package);
/**
@@ -594,8 +593,7 @@ public class ApplicationContext implements ServletContext {
return null;
}
if (!path.startsWith("/")) {
- throw new IllegalArgumentException
- (sm.getString("applicationContext.resourcePaths.iae", path));
+ throw new IllegalArgumentException (sm.getString("applicationContext.resourcePaths.iae", path));
}
WebResourceRoot resources = context.getResources();
@@ -676,26 +674,23 @@ public class ApplicationContext implements ServletContext {
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0))
+ if ((listeners == null) || (listeners.length == 0)) {
return;
- ServletContextAttributeEvent event =
- new ServletContextAttributeEvent(context.getServletContext(),
- name, value);
+ }
+ ServletContextAttributeEvent event = new ServletContextAttributeEvent(
+ context.getServletContext(), name, value);
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributeListener))
+ if (!(listeners[i] instanceof ServletContextAttributeListener)) {
continue;
- ServletContextAttributeListener listener =
- (ServletContextAttributeListener) listeners[i];
+ }
+ ServletContextAttributeListener listener = (ServletContextAttributeListener) listeners[i];
try {
- context.fireContainerEvent("beforeContextAttributeRemoved",
- listener);
+ context.fireContainerEvent("beforeContextAttributeRemoved", listener);
listener.attributeRemoved(event);
- context.fireContainerEvent("afterContextAttributeRemoved",
- listener);
+ context.fireContainerEvent("afterContextAttributeRemoved", listener);
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- context.fireContainerEvent("afterContextAttributeRemoved",
- listener);
+ context.fireContainerEvent("afterContextAttributeRemoved", listener);
// FIXME - should we do anything besides log these?
log(sm.getString("applicationContext.attributeEvent"), t);
}
@@ -707,8 +702,7 @@ public class ApplicationContext implements ServletContext {
public void setAttribute(String name, Object value) {
// Name cannot be null
if (name == null) {
- throw new NullPointerException
- (sm.getString("applicationContext.setAttribute.namenull"));
+ throw new NullPointerException(sm.getString("applicationContext.setAttribute.namenull"));
}
// Null value is the same as removeAttribute()
@@ -719,53 +713,47 @@ public class ApplicationContext implements ServletContext {
// Add or replace the specified attribute
// Check for read only attribute
- if (readOnlyAttributes.containsKey(name))
+ if (readOnlyAttributes.containsKey(name)) {
return;
+ }
Object oldValue = attributes.put(name, value);
boolean replaced = oldValue != null;
// Notify interested application event listeners
Object listeners[] = context.getApplicationEventListeners();
- if ((listeners == null) || (listeners.length == 0))
+ if ((listeners == null) || (listeners.length == 0)) {
return;
+ }
ServletContextAttributeEvent event = null;
- if (replaced)
- event =
- new ServletContextAttributeEvent(context.getServletContext(),
- name, oldValue);
- else
- event =
- new ServletContextAttributeEvent(context.getServletContext(),
- name, value);
+ if (replaced) {
+ event = new ServletContextAttributeEvent(context.getServletContext(), name, oldValue);
+ } else {
+ event = new ServletContextAttributeEvent(context.getServletContext(), name, value);
+ }
for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributeListener))
+ if (!(listeners[i] instanceof ServletContextAttributeListener)) {
continue;
- ServletContextAttributeListener listener =
- (ServletContextAttributeListener) listeners[i];
+ }
+ ServletContextAttributeListener listener = (ServletContextAttributeListener) listeners[i];
try {
if (replaced) {
- context.fireContainerEvent
- ("beforeContextAttributeReplaced", listener);
+ context.fireContainerEvent("beforeContextAttributeReplaced", listener);
listener.attributeReplaced(event);
- context.fireContainerEvent("afterContextAttributeReplaced",
- listener);
+ context.fireContainerEvent("afterContextAttributeReplaced", listener);
} else {
- context.fireContainerEvent("beforeContextAttributeAdded",
- listener);
+ context.fireContainerEvent("beforeContextAttributeAdded", listener);
listener.attributeAdded(event);
- context.fireContainerEvent("afterContextAttributeAdded",
- listener);
+ context.fireContainerEvent("afterContextAttributeAdded", listener);
}
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- if (replaced)
- context.fireContainerEvent("afterContextAttributeReplaced",
- listener);
- else
- context.fireContainerEvent("afterContextAttributeAdded",
- listener);
+ if (replaced) {
+ context.fireContainerEvent("afterContextAttributeReplaced", listener);
+ } else {
+ context.fireContainerEvent("afterContextAttributeAdded", listener);
+ }
// FIXME - should we do anything besides log these?
log(sm.getString("applicationContext.attributeEvent"), t);
}
@@ -978,8 +966,7 @@ public class ApplicationContext implements ServletContext {
@Override
- public <T extends Servlet> T createServlet(Class<T> c)
- throws ServletException {
+ public <T extends Servlet> T createServlet(Class<T> c) throws ServletException {
try {
@SuppressWarnings("unchecked")
T servlet = (T) context.getInstanceManager().newInstance(c.getName());
@@ -1085,8 +1072,7 @@ public class ApplicationContext implements ServletContext {
public boolean setInitParameter(String name, String value) {
// Name cannot be null
if (name == null) {
- throw new NullPointerException
- (sm.getString("applicationContext.setAttribute.namenull"));
+ throw new NullPointerException(sm.getString("applicationContext.setAttribute.namenull"));
}
if (!context.getState().equals(LifecycleState.STARTING_PREP)) {
throw new IllegalStateException(
@@ -1160,9 +1146,8 @@ public class ApplicationContext implements ServletContext {
match = true;
}
- if (t instanceof HttpSessionListener
- || (t instanceof ServletContextListener &&
- newServletContextListenerAllowed)) {
+ if (t instanceof HttpSessionListener ||
+ (t instanceof ServletContextListener && newServletContextListenerAllowed)) {
// Add listener directly to the list of instances rather than to
// the list of class names.
context.addApplicationLifecycleListener(t);
@@ -1188,8 +1173,7 @@ public class ApplicationContext implements ServletContext {
throws ServletException {
try {
@SuppressWarnings("unchecked")
- T listener =
- (T) context.getInstanceManager().newInstance(c);
+ T listener = (T) context.getInstanceManager().newInstance(c);
if (listener instanceof ServletContextListener ||
listener instanceof ServletContextAttributeListener ||
listener instanceof ServletRequestListener ||
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 03/04: Simplify code. We already have the Service for this
Context so use it.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit cc90fc683f36d7c853b7bde56f36a570a131d6c6
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 8 10:14:52 2019 +0100
Simplify code. We already have the Service for this Context so use it.
---
java/org/apache/catalina/core/ApplicationContext.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index fe70a32..79f2a8b 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -261,7 +261,7 @@ public class ApplicationContext implements ServletContext {
pathMB.setString(uri);
MappingData mappingData = new MappingData();
- ((Engine) host.getParent()).getService().getMapper().map(hostMB, pathMB, null, mappingData);
+ service.getMapper().map(hostMB, pathMB, null, mappingData);
child = mappingData.context;
}
} catch (Throwable t) {
@@ -1010,8 +1010,7 @@ public class ApplicationContext implements ServletContext {
// SSL not enabled by default as it can only used on its own
// Context > Host > Engine > Service
- Service s = ((Engine) context.getParent().getParent()).getService();
- Connector[] connectors = s.findConnectors();
+ Connector[] connectors = service.findConnectors();
// Need at least one SSL enabled connector to use the SSL session ID.
for (Connector connector : connectors) {
if (Boolean.TRUE.equals(connector.getAttribute("SSLEnabled"))) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 04/04: Use enhanced for-loops. Based on PR #177 by Govinda
Sakhare.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 2edb9b000e77967b651fe78df81d47ac5fb828fb
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 8 13:02:38 2019 +0100
Use enhanced for-loops. Based on PR #177 by Govinda Sakhare.
---
java/org/apache/catalina/core/ApplicationContext.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index 79f2a8b..79628e0 100644
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -679,11 +679,11 @@ public class ApplicationContext implements ServletContext {
}
ServletContextAttributeEvent event = new ServletContextAttributeEvent(
context.getServletContext(), name, value);
- for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributeListener)) {
+ for (Object obj : listeners) {
+ if (!(obj instanceof ServletContextAttributeListener)) {
continue;
}
- ServletContextAttributeListener listener = (ServletContextAttributeListener) listeners[i];
+ ServletContextAttributeListener listener = (ServletContextAttributeListener) obj;
try {
context.fireContainerEvent("beforeContextAttributeRemoved", listener);
listener.attributeRemoved(event);
@@ -732,11 +732,11 @@ public class ApplicationContext implements ServletContext {
event = new ServletContextAttributeEvent(context.getServletContext(), name, value);
}
- for (int i = 0; i < listeners.length; i++) {
- if (!(listeners[i] instanceof ServletContextAttributeListener)) {
+ for (Object obj : listeners) {
+ if (!(obj instanceof ServletContextAttributeListener)) {
continue;
}
- ServletContextAttributeListener listener = (ServletContextAttributeListener) listeners[i];
+ ServletContextAttributeListener listener = (ServletContextAttributeListener) obj;
try {
if (replaced) {
context.fireContainerEvent("beforeContextAttributeReplaced", listener);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
[tomcat] 01/04: Add a check, commented out by default,
that helps when tidying up code
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 802caad5a32f4cf4feb754deef09f061338a8d36
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Jul 8 10:06:43 2019 +0100
Add a check, commented out by default, that helps when tidying up code
---
res/checkstyle/checkstyle.xml | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/res/checkstyle/checkstyle.xml b/res/checkstyle/checkstyle.xml
index 60596c1..711212e 100644
--- a/res/checkstyle/checkstyle.xml
+++ b/res/checkstyle/checkstyle.xml
@@ -78,7 +78,14 @@
<module name="RedundantImport"/>
<module name="UnusedImports"/>
- <!-- Modifiers -->
+ <!-- Miscellaneous -->
+ <!-- ~5000 errors
+ <module name="Indentation">
+ <property name="lineWrappingIndentation" value="8"/>
+ </module>
+ -->
+
+ <!-- Modifiers -->
<module name="ModifierOrder"/>
<!-- ~1750 errors
<module name="RedundantModifier"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org