(tomcat) 03/04: Code clean-up - formatting. No functional change.

2024-05-03 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 513da9085a12b8c51764033f80249b99d736ed9a
Author: Mark Thomas 
AuthorDate: Fri May 3 08:11:25 2024 +0100

Code clean-up - formatting. No functional change.
---
 .../apache/catalina/ant/AbstractCatalinaTask.java  | 58 ++---
 .../catalina/ant/BaseRedirectorHelperTask.java | 89 
 java/org/apache/catalina/ant/DeployTask.java   | 12 ++-
 java/org/apache/catalina/ant/FindLeaksTask.java| 12 +--
 .../apache/catalina/ant/JKStatusUpdateTask.java| 96 --
 java/org/apache/catalina/ant/JMXGetTask.java   | 25 +++---
 java/org/apache/catalina/ant/JMXQueryTask.java | 19 +++--
 java/org/apache/catalina/ant/JMXSetTask.java   | 35 
 java/org/apache/catalina/ant/ListTask.java |  4 +-
 java/org/apache/catalina/ant/ReloadTask.java   |  5 +-
 java/org/apache/catalina/ant/ResourcesTask.java| 10 +--
 java/org/apache/catalina/ant/ServerinfoTask.java   |  3 +-
 java/org/apache/catalina/ant/SessionsTask.java |  3 +-
 .../catalina/ant/SslConnectorCiphersTask.java  |  4 +-
 java/org/apache/catalina/ant/StartTask.java|  4 +-
 java/org/apache/catalina/ant/StopTask.java |  4 +-
 java/org/apache/catalina/ant/ThreaddumpTask.java   |  4 +-
 java/org/apache/catalina/ant/UndeployTask.java |  4 +-
 java/org/apache/catalina/ant/ValidatorTask.java|  9 +-
 java/org/apache/catalina/ant/VminfoTask.java   |  4 +-
 20 files changed, 167 insertions(+), 237 deletions(-)

diff --git a/java/org/apache/catalina/ant/AbstractCatalinaTask.java 
b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
index 61ac76e5e5..02a0d2bdc2 100644
--- a/java/org/apache/catalina/ant/AbstractCatalinaTask.java
+++ b/java/org/apache/catalina/ant/AbstractCatalinaTask.java
@@ -32,11 +32,11 @@ import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 
 /**
- * Abstract base class for Ant tasks that interact with the Manager 
web
- * application for dynamically deploying and undeploying applications. These
- * tasks require Ant 1.4 or later.
+ * Abstract base class for Ant tasks that interact with the Manager 
web application for dynamically deploying
+ * and undeploying applications. These tasks require Ant 1.4 or later.
  *
  * @author Craig R. McClanahan
+ *
  * @since 4.1
  */
 public abstract class AbstractCatalinaTask extends BaseRedirectorHelperTask {
@@ -107,16 +107,14 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 }
 
 /**
- * If set to true - ignore the constraint of the first line of the response
- * message that must be "OK -".
+ * If set to true - ignore the constraint of the first line of the 
response message that must be "OK -".
  * 
- * When this attribute is set to {@code false} (the default), the first 
line
- * of server response is expected to start with "OK -". If it does not then
- * the task is considered as failed and the first line is treated as an
- * error message.
+ * When this attribute is set to {@code false} (the default), the first 
line of server response is expected to start
+ * with "OK -". If it does not then the task is considered as failed and 
the first line is treated as an error
+ * message.
  * 
- * When this attribute is set to {@code true}, the first line of the
- * response is treated like any other, regardless of its text.
+ * When this attribute is set to {@code true}, the first line of the 
response is treated like any other, regardless
+ * of its text.
  */
 protected boolean ignoreResponseConstraint = false;
 
@@ -132,9 +130,8 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 // - Public Methods
 
 /**
- * Execute the specified command. This logic only performs the common
- * attribute validation required by all subclasses; it does not perform any
- * functional logic directly.
+ * Execute the specified command. This logic only performs the common 
attribute validation required by all
+ * subclasses; it does not perform any functional logic directly.
  *
  * @exception BuildException if a validation error occurs
  */
@@ -159,19 +156,18 @@ public abstract class AbstractCatalinaTask extends 
BaseRedirectorHelperTask {
 
 
 /**
- * Execute the specified command, based on the configured properties. The
- * input stream will be closed upon completion of this task, whether it was
- * executed successfully or not.
+ * Execute the specified command, based on the configured properties. The 
input stream will be closed upon
+ * completion of this task, whether it was executed successfully or not.
  *
- * @param command Command to be ex

[tomcat] 03/04: Code clean-up - formatting. No functional change.

2023-06-14 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 941633150e68644df5bfb023e33fc627de109927
Author: Mark Thomas 
AuthorDate: Wed Jun 14 12:15:26 2023 +0100

Code clean-up - formatting. No functional change.
---
 test/jakarta/servlet/TestSessionCookieConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jakarta/servlet/TestSessionCookieConfig.java 
b/test/jakarta/servlet/TestSessionCookieConfig.java
index 5faa6680ba..737c702f83 100644
--- a/test/jakarta/servlet/TestSessionCookieConfig.java
+++ b/test/jakarta/servlet/TestSessionCookieConfig.java
@@ -48,7 +48,7 @@ public class TestSessionCookieConfig extends TomcatBaseTest {
 Assert.assertTrue(responseHeaders.containsKey("Set-Cookie"));
 
 List setCookieHeaders = responseHeaders.get("Set-Cookie");
-Assert.assertEquals(1,  setCookieHeaders.size());
+Assert.assertEquals(1, setCookieHeaders.size());
 
 String setCookieHeader = setCookieHeaders.get(0);
 Assert.assertTrue(setCookieHeader.contains("; aaa=bbb"));


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/04: Code clean-up - formatting. No functional change.

2023-06-14 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit f49913c656a808172adaf329667c3253935c01f4
Author: Mark Thomas 
AuthorDate: Wed Jun 14 12:00:33 2023 +0100

Code clean-up - formatting. No functional change.
---
 test/jakarta/servlet/TestSessionCookieConfig.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/jakarta/servlet/TestSessionCookieConfig.java 
b/test/jakarta/servlet/TestSessionCookieConfig.java
index 5faa6680ba..737c702f83 100644
--- a/test/jakarta/servlet/TestSessionCookieConfig.java
+++ b/test/jakarta/servlet/TestSessionCookieConfig.java
@@ -48,7 +48,7 @@ public class TestSessionCookieConfig extends TomcatBaseTest {
 Assert.assertTrue(responseHeaders.containsKey("Set-Cookie"));
 
 List setCookieHeaders = responseHeaders.get("Set-Cookie");
-Assert.assertEquals(1,  setCookieHeaders.size());
+Assert.assertEquals(1, setCookieHeaders.size());
 
 String setCookieHeader = setCookieHeaders.get(0);
 Assert.assertTrue(setCookieHeader.contains("; aaa=bbb"));


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org