update naming and add final

Author: alan0428a

log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxy.java

@@ -255,7 +255,7 @@ public ThrowableProxy getCauseProxy() {
  * @param suffix Append this to the end of each stack frame.
  */
  public String getCauseStackTraceAsString(final String suffix) {
- return this.getCauseStackTraceAsString(null, PlainTextRenderer.getInstance(), suffix, EOL_STR, null);
+ return this.getCauseStackTraceAsString(null, PlainTextRenderer.getInstance(), suffix, EOL_STR);
  }
 
  /**
@@ -266,7 +266,7 @@ public String getCauseStackTraceAsString(final String suffix) {
  * @return The formatted Throwable that caused this Throwable.
  */
  public String getCauseStackTraceAsString(final List<String> packages, final String suffix) {
- return getCauseStackTraceAsString(packages, PlainTextRenderer.getInstance(), suffix, EOL_STR, null);
+ return getCauseStackTraceAsString(packages, PlainTextRenderer.getInstance(), suffix, EOL_STR);
  }
 
  /**
@@ -279,7 +279,7 @@ public String getCauseStackTraceAsString(final List<String> packages, final Stri
  */
  public String getCauseStackTraceAsString(
  final List<String> ignorePackages, final TextRenderer textRenderer, final String suffix) {
- return getCauseStackTraceAsString(ignorePackages, textRenderer, suffix, EOL_STR, null);
+ return getCauseStackTraceAsString(ignorePackages, textRenderer, suffix, EOL_STR);
  }
 
  /**
@@ -295,11 +295,10 @@ public String getCauseStackTraceAsString(
  final List<String> ignorePackages,
  final TextRenderer textRenderer,
  final String suffix,
- final String lineSeparator,
- final Integer linesToKeep) {
+ final String lineSeparator) {
  final StringBuilder sb = new StringBuilder();
  ThrowableProxyRenderer.formatCauseStackTraceTo(
- this, sb, ignorePackages, textRenderer, suffix, lineSeparator, linesToKeep);
+ this, sb, ignorePackages, textRenderer, suffix, lineSeparator, null);
  return sb.toString();
  }
 
@@ -311,17 +310,17 @@ public String getCauseStackTraceAsString(
  * @param textRenderer The message renderer.
  * @param suffix Append this to the end of each stack frame.
  * @param lineSeparator The end-of-line separator.
- * @param linesToKeep The total line count of final result
+ * @param maxLineCount The total line count of final result
  */
  public void formatCauseStackTraceTo(
  final StringBuilder sb,
  final List<String> ignorePackages,
  final TextRenderer textRenderer,
  final String suffix,
  final String lineSeparator,
- final Integer linesToKeep) {
+ final Integer maxLineCount) {
  ThrowableProxyRenderer.formatCauseStackTraceTo(
- this, sb, ignorePackages, textRenderer, suffix, lineSeparator, linesToKeep);
+ this, sb, ignorePackages, textRenderer, suffix, lineSeparator, maxLineCount);
  }
 
  /**
@@ -424,17 +423,17 @@ public String getExtendedStackTraceAsString(
  * @param textRenderer The message renderer.
  * @param suffix Append this to the end of each stack frame.
  * @param lineSeparator The end-of-line separator.
- * @param linesToKeep The total line count of final result
+ * @param maxLineCount The total line count of final result
  */
  public void formatExtendedStackTraceTo(
  final StringBuilder sb,
  final List<String> ignorePackages,
  final TextRenderer textRenderer,
  final String suffix,
  final String lineSeparator,
- final Integer linesToKeep) {
+ final Integer maxLineCount) {
  ThrowableProxyRenderer.formatExtendedStackTraceTo(
- this, sb, ignorePackages, textRenderer, suffix, lineSeparator, linesToKeep);
+ this, sb, ignorePackages, textRenderer, suffix, lineSeparator, maxLineCount);
  }
 
  public String getLocalizedMessage() {

log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableProxyRenderer.java

@@ -241,7 +241,7 @@ static void formatExtendedStackTraceTo(
  final TextRenderer textRenderer,
  final String suffix,
  final String lineSeparator,
- final Integer linesToKeep) {
+ final Integer maxLineCount) {
  renderOn(src, sb, textRenderer);
  renderSuffix(suffix, sb, textRenderer);
  textRenderer.render(lineSeparator, sb, "Text");
@@ -259,7 +259,7 @@ static void formatExtendedStackTraceTo(
  lineSeparator);
  formatSuppressed(sb, TAB, src.getSuppressedProxies(), ignorePackages, textRenderer, suffix, lineSeparator);
  formatCause(sb, Strings.EMPTY, src.getCauseProxy(), ignorePackages, textRenderer, suffix, lineSeparator);
- truncateLines(sb, lineSeparator, linesToKeep, textRenderer);
+ truncateLines(sb, lineSeparator, maxLineCount, textRenderer);
  }
 
  /**
@@ -279,7 +279,7 @@ static void formatCauseStackTraceTo(
  final TextRenderer textRenderer,
  final String suffix,
  final String lineSeparator,
- final Integer linesToKeep) {
+ final Integer maxLineCount) {
  final ThrowableProxy causeProxy = src.getCauseProxy();
  if (causeProxy != null) {
  formatWrapper(sb, causeProxy, ignorePackages, textRenderer, suffix, lineSeparator);
@@ -299,7 +299,7 @@ static void formatCauseStackTraceTo(
  textRenderer,
  suffix,
  lineSeparator);
- truncateLines(sb, lineSeparator, linesToKeep, textRenderer);
+ truncateLines(sb, lineSeparator, maxLineCount, textRenderer);
  }
 
  private static void renderOn(
@@ -313,20 +313,23 @@ private static void renderOn(
  }
 
  private static void truncateLines(
- StringBuilder sb, String lineSeparator, Integer linesToKeep, TextRenderer textRenderer) {
- if (linesToKeep == null) {
+ final StringBuilder sb,
+ final String lineSeparator,
+ final Integer maxLineCount,
+ final TextRenderer textRenderer) {
+ if (maxLineCount == null) {
  return;
  }
 
  String content = sb.toString();
  String[] lines = content.split(lineSeparator);
 
- if (lines.length <= linesToKeep) {
+ if (lines.length <= maxLineCount) {
  return;
  }
 
  sb.setLength(0);
- for (int i = 0; i < linesToKeep; i++) {
+ for (int i = 0; i < maxLineCount; i++) {
  sb.append(lines[i]);
  textRenderer.render(lineSeparator, sb, "Text");
  }

log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/ThrowablePatternConverter.java

@@ -275,27 +275,32 @@ private void appendEntry(
  sb.append(lineSeparator);
  }
 
- private void appendSuffix(StringBuilder buffer, String suffix) {
+ private void appendSuffix(
+ final StringBuilder buffer,
+ final String suffix) {
  if (Strings.isNotBlank(suffix)) {
  buffer.append(' ');
  buffer.append(suffix);
  }
  }
 
- private void truncateLines(StringBuilder sb, String lineSeparator, Integer linesToKeep) {
- if (linesToKeep == null) {
+ private void truncateLines(
+ final StringBuilder sb,
+ final String lineSeparator,
+ final Integer maxLineCount) {
+ if (maxLineCount == null) {
  return;
  }
 
  String content = sb.toString();
  String[] lines = content.split(lineSeparator);
 
- if (lines.length <= linesToKeep) {
+ if (lines.length <= maxLineCount) {
  return;
  }
 
  sb.setLength(0);
- for (int i = 0; i < linesToKeep; i++) {
+ for (int i = 0; i < maxLineCount; i++) {
  sb.append(lines[i]);
  sb.append(lineSeparator);
  }