You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by fs...@apache.org on 2020/02/09 11:14:36 UTC
[tomcat-jakartaee-migration] branch master updated: Simplify code
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat-jakartaee-migration.git
The following commit(s) were added to refs/heads/master by this push:
new 8207a5d Simplify code
8207a5d is described below
commit 8207a5d74e2b22f0d5e2e58dd37ee3d9ae9bd74e
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Sun Feb 9 12:12:15 2020 +0100
Simplify code
No need for if clause. The return values are the result of the if-expression.
With the last commit, we are sure that we don't get null values, so we don't have
to guard or code against it.
---
src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java | 10 +---------
src/main/java/org/apache/tomcat/jakartaee/TextConverter.java | 9 +--------
2 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 303b066..4b7777b 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -30,15 +30,7 @@ public class ClassConverter implements Converter {
@Override
public boolean accepts(String filename) {
String extension = Util.getExtension(filename);
- if (extension == null || extension.length() == 0) {
- return false;
- }
-
- if ("class".equals(extension)) {
- return true;
- }
-
- return false;
+ return "class".equals(extension);
}
diff --git a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
index 7cf2530..d0a0db2 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/TextConverter.java
@@ -45,15 +45,8 @@ public class TextConverter implements Converter {
@Override
public boolean accepts(String filename) {
String extension = Util.getExtension(filename);
- if (extension == null || extension.length() == 0) {
- return false;
- }
-
- if (supportedExtensions.contains(extension)) {
- return true;
- }
- return false;
+ return supportedExtensions.contains(extension);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org