This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 1465981d9a Add some indent
1465981d9a is described below
commit 1465981d9a3c9c6b6035d0424d51087a981cdadc
Author: remm <r...@apache.org>
AuthorDate: Thu Jan 4 16:07:09 2024 +0100
Add some indent
---
.../apache/catalina/manager/StatusTransformer.java | 54 +++++++++++++---------
1 file changed, 33 insertions(+), 21 deletions(-)
diff --git a/java/org/apache/catalina/manager/StatusTransformer.java
b/java/org/apache/catalina/manager/StatusTransformer.java
index 3b02474605..f06c172ab4 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -211,24 +211,25 @@ public class StatusTransformer {
writer.write("</jvm>");
} else if (mode == 2) {
-
writer.append('"').append("jvm").append('"').append(':').append('{').println();
+ indent(writer,
1).append('"').append("jvm").append('"').append(':').append('{').println();
-
writer.append('"').append("memory").append('"').append(':').append('{');
+ indent(writer,
2).append('"').append("memory").append('"').append(':').append('{');
appendJSonValue(writer, "free",
Long.toString(Runtime.getRuntime().freeMemory())).append(',');
appendJSonValue(writer, "total",
Long.toString(Runtime.getRuntime().totalMemory())).append(',');
appendJSonValue(writer, "max",
Long.toString(Runtime.getRuntime().maxMemory()));
writer.append('}').append(',').println();
-
writer.append('"').append("memorypool").append('"').append(':').append('[');
+ indent(writer,
2).append('"').append("memorypool").append('"').append(':').append('[');
boolean first = true;
for (MemoryPoolMXBean memoryPoolMBean : memoryPoolMBeans.values())
{
MemoryUsage usage = memoryPoolMBean.getUsage();
if (first) {
first = false;
+ writer.println();
} else {
writer.append(',').println();
}
- writer.append('{');
+ indent(writer, 3).append('{');
appendJSonValue(writer, "name",
JSONFilter.escape(memoryPoolMBean.getName())).append(',');
appendJSonValue(writer, "type",
memoryPoolMBean.getType().toString()).append(',');
appendJSonValue(writer, "usageInit",
Long.toString(usage.getInit())).append(',');
@@ -239,7 +240,7 @@ public class StatusTransformer {
}
writer.append(']').println();
- writer.append('}');
+ indent(writer, 1).append('}');
}
}
@@ -250,6 +251,14 @@ public class StatusTransformer {
}
+ private static PrintWriter indent(PrintWriter writer, int count) {
+ for (int i = 0; i < count; i++) {
+ writer.append(' ').append(' ');
+ }
+ return writer;
+ }
+
+
/**
* Write connector state.
*
@@ -269,7 +278,7 @@ public class StatusTransformer {
throws Exception {
if (mode == 2) {
writer.append(',').println();
-
writer.append('"').append("connector").append('"').append(':').append('[').println();
+ indent(writer,
1).append('"').append("connector").append('"').append(':').append('[').println();
}
boolean first = true;
for (ObjectName objectName : threadPools) {
@@ -286,7 +295,7 @@ public class StatusTransformer {
writer, objectName, name, mBeanServer,
globalRequestProcessors, requestProcessors, mode, args);
}
if (mode == 2) {
- writer.append(']').println();
+ writer.append(']');
}
}
@@ -428,10 +437,11 @@ public class StatusTransformer {
writer.write("</connector>");
} else if (mode == 2) {
- writer.append('{').println();
+ indent(writer, 1).append('{').println();
+ indent(writer, 2);
appendJSonValue(writer, "name",
JSONFilter.escape(name)).append(',').println();
-
writer.append('"').append("threadInfo").append('"').append(':').append('{');
+ indent(writer,
2).append('"').append("threadInfo").append('"').append(':').append('{');
appendJSonValue(writer, "maxThreads",
mBeanServer.getAttribute(tpName, "maxThreads").toString()).append(',');
appendJSonValue(writer, "currentThreadCount",
mBeanServer.getAttribute(tpName, "currentThreadCount").toString()).append(',');
appendJSonValue(writer, "currentThreadsBusy",
mBeanServer.getAttribute(tpName, "currentThreadsBusy").toString());
@@ -447,7 +457,7 @@ public class StatusTransformer {
if (grpName != null) {
writer.append(',').println();
-
writer.append('"').append("requestInfo").append('"').append(':').append('{');
+ indent(writer,
2).append('"').append("requestInfo").append('"').append(':').append('{');
appendJSonValue(writer, "maxTime",
mBeanServer.getAttribute(grpName, "maxTime").toString()).append(',');
appendJSonValue(writer, "processingTime",
mBeanServer.getAttribute(grpName, "processingTime").toString()).append(',');
appendJSonValue(writer, "requestCount",
mBeanServer.getAttribute(grpName, "requestCount").toString()).append(',');
@@ -458,7 +468,7 @@ public class StatusTransformer {
// Note: No detailed per processor info
}
- writer.append('}');
+ indent(writer, 1).append('}');
}
}
@@ -692,7 +702,7 @@ public class StatusTransformer {
// for now we don't write out the Detailed state in XML
} else if (mode == 2) {
writer.append(',').println();
-
writer.append('"').append("context").append('"').append(':').append('[');
+ indent(writer,
1).append('"').append("context").append('"').append(':').append('[').println();
Iterator<ObjectName> iterator = hostsON.iterator();
boolean first = true;
while (iterator.hasNext()) {
@@ -704,7 +714,8 @@ public class StatusTransformer {
ObjectName contextON = iterator.next();
writeContext(writer, contextON, mBeanServer, mode);
}
- writer.append(']').println();
+ writer.println();
+ indent(writer, 1).append(']').println();
}
}
@@ -791,8 +802,8 @@ public class StatusTransformer {
} else if (mode == 1) {
// for now we don't write out the context in XML
} else if (mode == 2) {
- writer.append('{');
- appendJSonValue(writer, "name",
JSONFilter.escape(JSONFilter.escape(name))).append(',');
+ indent(writer, 2).append('{').println();
+ appendJSonValue(indent(writer, 3), "name",
JSONFilter.escape(JSONFilter.escape(name))).append(',');
appendJSonValue(writer, "startTime",
new Date(((Long) mBeanServer.getAttribute(objectName,
"startTime")).longValue()).toString()).append(',');
appendJSonValue(writer, "startupTime",
mBeanServer.getAttribute(objectName, "startupTime").toString()).append(',');
@@ -804,7 +815,7 @@ public class StatusTransformer {
writeJspMonitor(writer, jspMonitorONs, mBeanServer, mode);
}
writer.append(',').println();
-
writer.append('"').append("wrapper").append('"').append(':').append('[');
+ indent(writer,
3).append('"').append("wrapper").append('"').append(':').append('[').println();
String onStr = objectName.getDomain() +
":j2eeType=Servlet,WebModule=" + webModuleName + ",*";
ObjectName servletObjectName = new ObjectName(onStr);
Set<ObjectInstance> set =
mBeanServer.queryMBeans(servletObjectName, null);
@@ -817,8 +828,9 @@ public class StatusTransformer {
}
writeWrapper(writer, oi.getObjectName(), mBeanServer, mode);
}
- writer.append(']').println();
- writer.append('}');
+ writer.println();
+ indent(writer, 3).append(']').println();
+ indent(writer, 2).append('}');
}
}
@@ -859,7 +871,7 @@ public class StatusTransformer {
// for now we don't write out the wrapper details
} else if (mode == 2) {
writer.append(',').println();
-
writer.append('"').append("manager").append('"').append(':').append('{');
+ indent(writer,
3).append('"').append("manager").append('"').append(':').append('{');
appendJSonValue(writer, "activeSessions",
mBeanServer.getAttribute(objectName, "activeSessions").toString()).append(',');
appendJSonValue(writer, "sessionCounter",
mBeanServer.getAttribute(objectName, "sessionCounter").toString()).append(',');
appendJSonValue(writer, "maxActive",
mBeanServer.getAttribute(objectName, "maxActive").toString()).append(',');
@@ -907,7 +919,7 @@ public class StatusTransformer {
// for now we don't write out anything
} else if (mode == 2) {
writer.append(',').println();
-
writer.append('"').append("jsp").append('"').append(':').append('{');
+ indent(writer,
3).append('"').append("jsp").append('"').append(':').append('{');
appendJSonValue(writer, "jspCount",
Integer.toString(jspCount)).append(',');
appendJSonValue(writer, "jspReloadCount",
Integer.toString(jspReloadCount));
writer.append('}');
@@ -964,7 +976,7 @@ public class StatusTransformer {
} else if (mode == 1) {
// for now we don't write out the wrapper details
} else if (mode == 2) {
- writer.append('{');
+ indent(writer, 4).append('{');
appendJSonValue(writer, "servletName",
JSONFilter.escape(servletName)).append(',');
appendJSonValue(writer, "processingTime",
mBeanServer.getAttribute(objectName, "processingTime").toString()).append(',');
appendJSonValue(writer, "maxTime",
mBeanServer.getAttribute(objectName, "maxTime").toString()).append(',');
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
