You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by vy...@apache.org on 2023/10/03 07:44:05 UTC
[logging-log4j-tools] 04/06: Fix Error Prone warnings
This is an automated email from the ASF dual-hosted git repository.
vy pushed a commit to branch release/0.5.0
in repository https://gitbox.apache.org/repos/asf/logging-log4j-tools.git
commit 2db4d9cd2b722ab371282fad7692c1bfd5c2e5c4
Author: Volkan Yazıcı <vo...@yazi.ci>
AuthorDate: Mon Oct 2 12:47:03 2023 +0200
Fix Error Prone warnings
---
.../src/main/java/org/apache/logging/log4j/ExportMojo.java | 1 +
.../src/main/java/org/apache/logging/log4j/ImportMojo.java | 1 +
.../src/main/java/org/apache/logging/log4j/ReleaseMojo.java | 4 +++-
.../log4j/changelog/importer/MavenChangesImporter.java | 1 +
.../logging/log4j/changelog/releaser/ChangelogReleaser.java | 3 ++-
.../log4j/changelog/util/PositionalSaxEventHandler.java | 13 +++++++------
6 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java
index 084f611..444fc63 100644
--- a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java
+++ b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ExportMojo.java
@@ -72,6 +72,7 @@ public final class ExportMojo extends AbstractMojo {
required = true)
private File outputDirectory;
+ @Override
public synchronized void execute() {
final Set<ChangelogExporterTemplate> translatedIndexTemplates = toExporterTemplates(indexTemplates);
final Set<ChangelogExporterTemplate> translatedReleaseChangelogTemplates = toExporterTemplates(
diff --git a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java
index 64c8906..49e2b2b 100644
--- a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java
+++ b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ImportMojo.java
@@ -59,6 +59,7 @@ public final class ImportMojo extends AbstractMojo {
required = true)
private int releaseVersionMajor;
+ @Override
public synchronized void execute() {
final MavenChangesImporterArgs args = new MavenChangesImporterArgs(
changelogDirectory.toPath(),
diff --git a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java
index c460899..60fa8fd 100644
--- a/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java
+++ b/log4j-changelog-maven-plugin/src/main/java/org/apache/logging/log4j/ReleaseMojo.java
@@ -18,6 +18,7 @@ package org.apache.logging.log4j;
import java.io.File;
import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.regex.Pattern;
import org.apache.logging.log4j.changelog.releaser.ChangelogReleaser;
@@ -66,13 +67,14 @@ public final class ReleaseMojo extends AbstractMojo {
@Parameter(property = "log4j.changelog.versionPattern")
private String versionPattern;
+ @Override
public synchronized void execute() {
Pattern compiledVersionPattern = versionPattern != null ? Pattern.compile(versionPattern) : null;
final ChangelogReleaserArgs args = new ChangelogReleaserArgs(
changelogDirectory.toPath(),
releaseVersion,
compiledVersionPattern,
- LocalDate.now());
+ LocalDate.now(ZoneId.systemDefault()));
ChangelogReleaser.performRelease(args);
}
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporter.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporter.java
index bfc255f..bfd0a70 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporter.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/importer/MavenChangesImporter.java
@@ -92,6 +92,7 @@ public final class MavenChangesImporter {
return actionRelativeFileBuilder.toString();
}
+ @SuppressWarnings("StringSplitter")
private static ChangelogEntry changelogEntry(final MavenChanges.Action action) {
// Create the `type`
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
index 0420b04..149877f 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/releaser/ChangelogReleaser.java
@@ -21,6 +21,7 @@ import java.io.UncheckedIOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.Set;
import java.util.stream.Collectors;
@@ -37,7 +38,7 @@ public final class ChangelogReleaser {
public static void performRelease(final ChangelogReleaserArgs args) {
// Read the release date and version
- final String releaseDate = ISO_DATE.format(args.releaseDate != null ? args.releaseDate : LocalDate.now());
+ final String releaseDate = ISO_DATE.format(args.releaseDate != null ? args.releaseDate : LocalDate.now(ZoneId.systemDefault()));
System.out.format("using `%s` for the release date%n", releaseDate);
try {
diff --git a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PositionalSaxEventHandler.java b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PositionalSaxEventHandler.java
index efa3390..cf1b9ad 100644
--- a/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PositionalSaxEventHandler.java
+++ b/log4j-changelog/src/main/java/org/apache/logging/log4j/changelog/util/PositionalSaxEventHandler.java
@@ -16,7 +16,8 @@
*/
package org.apache.logging.log4j.changelog.util;
-import java.util.Stack;
+import java.util.ArrayDeque;
+import java.util.Deque;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -33,7 +34,7 @@ import org.xml.sax.helpers.DefaultHandler;
*/
final class PositionalSaxEventHandler extends DefaultHandler {
- private final Stack<Element> elementStack = new Stack<>();
+ private final Deque<Element> elementStack = new ArrayDeque<>();
private final StringBuilder textBuffer = new StringBuilder();
@@ -64,7 +65,7 @@ final class PositionalSaxEventHandler extends DefaultHandler {
element.setAttribute(attributeQName, attributeValue);
}
element.setUserData("lineNumber", String.valueOf(locator.getLineNumber()), null);
- elementStack.push(element);
+ elementStack.addFirst(element);
}
@Override
@@ -73,12 +74,12 @@ final class PositionalSaxEventHandler extends DefaultHandler {
final String localName,
final String qName) {
addTextIfNeeded();
- final Element closedElement = elementStack.pop();
+ final Element closedElement = elementStack.removeFirst();
final boolean rootElement = elementStack.isEmpty();
if (rootElement) {
document.appendChild(closedElement);
} else {
- final Element parentElement = elementStack.peek();
+ final Element parentElement = elementStack.peekFirst();
parentElement.appendChild(closedElement);
}
}
@@ -93,7 +94,7 @@ final class PositionalSaxEventHandler extends DefaultHandler {
*/
private void addTextIfNeeded() {
if (textBuffer.length() > 0) {
- final Element element = elementStack.peek();
+ final Element element = elementStack.peekFirst();
final Node textNode = document.createTextNode(textBuffer.toString());
element.appendChild(textNode);
textBuffer.delete(0, textBuffer.length());