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-jakartaee-migration.git
commit 2c0552ab668100dfb5677c366d43f64f49470d5d
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Sep 15 09:20:47 2022 +0100
Fix Checkstyle errors
---
src/main/java/org/apache/tomcat/jakartaee/AntHandler.java | 4 ++--
.../java/org/apache/tomcat/jakartaee/ClassConverter.java | 1 +
.../java/org/apache/tomcat/jakartaee/EESpecProfile.java | 10 +++++-----
src/main/java/org/apache/tomcat/jakartaee/GlobMatcher.java | 8 ++------
src/main/java/org/apache/tomcat/jakartaee/Migration.java | 13 +++++++++----
5 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/AntHandler.java
b/src/main/java/org/apache/tomcat/jakartaee/AntHandler.java
index e7747b7..5946226 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/AntHandler.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/AntHandler.java
@@ -27,11 +27,11 @@ import org.apache.tools.ant.Task;
/**
* JUL log handler redirecting the messages logged to Ant.
*/
- class AntHandler extends Handler {
+class AntHandler extends Handler {
private final Task task;
- public AntHandler(Task task) {
+ AntHandler(Task task) {
this.task = task;
}
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index da9ee42..8b4116d 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -26,6 +26,7 @@ import java.lang.instrument.IllegalClassFormatException;
import java.security.ProtectionDomain;
import java.util.logging.Level;
import java.util.logging.Logger;
+
import org.apache.bcel.classfile.ClassParser;
import org.apache.bcel.classfile.Constant;
import org.apache.bcel.classfile.ConstantUtf8;
diff --git a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
index 23eecbc..8ed0d91 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/EESpecProfile.java
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
*/
public enum EESpecProfile {
- TOMCAT("javax", "jakarta",
+ TOMCAT("javax", "jakarta",
"javax([/\\.](annotation(?![/\\.]processing)" +
"|ejb" +
"|el" +
@@ -35,7 +35,7 @@ public enum EESpecProfile {
"|transaction(?![/\\.]xa)" +
"|websocket))"),
- EE("javax", "jakarta",
+ EE("javax", "jakarta",
"javax([/\\.](activation" +
"|annotation(?![/\\.]processing)" +
"|batch" +
@@ -60,7 +60,7 @@ public enum EESpecProfile {
"|websocket" +
"|ws[/\\.]rs" +
"|xml[/\\.](bind|soap|ws)))"),
- JEE8("jakarta", "javax",
+ JEE8("jakarta", "javax",
"jakarta([/\\.](activation" +
"|annotation(?![/\\.]processing)" +
"|batch" +
@@ -100,12 +100,12 @@ public enum EESpecProfile {
Matcher m = pattern.matcher(name);
return m.replaceAll(target + "$1");
}
-
+
public String getSource()
{
return source;
}
-
+
public String getTarget()
{
return target;
diff --git a/src/main/java/org/apache/tomcat/jakartaee/GlobMatcher.java
b/src/main/java/org/apache/tomcat/jakartaee/GlobMatcher.java
index 33dc338..87bff59 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/GlobMatcher.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/GlobMatcher.java
@@ -233,11 +233,7 @@ public final class GlobMatcher {
return true;
}
- private static boolean different(
- boolean caseSensitive, char ch, char other) {
- return caseSensitive
- ? ch != other
- : Character.toUpperCase(ch) != Character.toUpperCase(other);
+ private static boolean different(boolean caseSensitive, char ch, char
other) {
+ return caseSensitive ? ch != other : Character.toUpperCase(ch) !=
Character.toUpperCase(other);
}
-
}
diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index d8b899c..35bfcbe 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -195,7 +195,7 @@ public class Migration {
boolean inplace = src.equals(dest);
if (!inplace) {
try (InputStream is = new FileInputStream(src);
- OutputStream os = new FileOutputStream(dest)) {
+ OutputStream os = new FileOutputStream(dest)) {
migrateStream(src.getName(), is, os);
}
} else {
@@ -283,8 +283,12 @@ public class Migration {
private boolean isSignatureFile(String sourceName) {
- return sourceName.startsWith("META-INF/")
- && (sourceName.endsWith(".SF") || sourceName.endsWith(".RSA")
|| sourceName.endsWith(".DSA") || sourceName.endsWith(".EC"));
+ return sourceName.startsWith("META-INF/") && (
+ sourceName.endsWith(".SF") ||
+ sourceName.endsWith(".RSA") ||
+ sourceName.endsWith(".DSA") ||
+ sourceName.endsWith(".EC")
+ );
}
@@ -334,7 +338,8 @@ public class Migration {
}
private static class MigrationZipArchiveEntry extends ZipArchiveEntry {
- public MigrationZipArchiveEntry(ZipArchiveEntry entry) throws
ZipException {
+
+ MigrationZipArchiveEntry(ZipArchiveEntry entry) throws ZipException {
super(entry);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
