Resolve spotbugs error and codestyle warnings

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
eb4j · Nov 30, 2021 · cdedac1 · cdedac1
1 parent dc10076
commit cdedac1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/main/java/io/github/eb4j/dsl/DslResult.java b/src/main/java/io/github/eb4j/dsl/DslResult.java
@@ -11,7 +11,7 @@ public class DslResult {
 
     private final List<Map.Entry<String, Object>> result;
 
-    public DslResult(List<Map.Entry<String, Object>> res) {
+    public DslResult(final List<Map.Entry<String, Object>> res) {
         result = res;
     }
 

diff --git a/src/main/java/io/github/eb4j/dsl/visitor/HtmlDslVisitor.java b/src/main/java/io/github/eb4j/dsl/visitor/HtmlDslVisitor.java
@@ -122,13 +122,13 @@ public void visit(final DslArticle.Tag tag) {
         }
     }
 
-    private String getMediaUrl(final String mediaFile) {
+    private String getMediaUrl() {
         return new File(basePath, mediaFile).toURI().toString();
     }
 
-    private boolean isImageFile(final String filename) {
+    private boolean isMediaImage() {
         for (String ext: IMAGE_EXTS) {
-            if (filename.endsWith(ext)) {
+            if (mediaFile.endsWith(ext)) {
                 return true;
             }
         }
@@ -147,12 +147,12 @@ public void visit(final DslArticle.EndTag endTag) {
                 return;
             }
             if (endTag.isTagName("video")) {
-                sb.append("<a href=\"").append(getMediaUrl(mediaFile)).append("\">").append(mediaFile).append("</a>");
+                sb.append("<a href=\"").append(getMediaUrl()).append("\">").append(mediaFile).append("</a>");
             } else if (endTag.isTagName("s")) {
-                if (isImageFile(mediaFile)) {
-                    sb.append("<img src=\"").append(getMediaUrl(mediaFile)).append("\" />");
+                if (isMediaImage()) {
+                    sb.append("<img src=\"").append(getMediaUrl()).append("\" />");
                 } else {  // sound and unknown files
-                    sb.append("<a href=\"").append(getMediaUrl(mediaFile)).append("\" >").append(mediaFile).append("</a>");
+                    sb.append("<a href=\"").append(getMediaUrl()).append("\" >").append(mediaFile).append("</a>");
                 }
             }
             mediaTag = false;

diff --git a/src/main/java/io/github/eb4j/dsl/visitor/PlainDslVisitor.java b/src/main/java/io/github/eb4j/dsl/visitor/PlainDslVisitor.java
@@ -32,7 +32,7 @@ public PlainDslVisitor() {
      * @param tag to visit.
      */
     @Override
-    public void visit(DslArticle.Tag tag) {
+    public void visit(final DslArticle.Tag tag) {
     }
 
     /**
@@ -41,7 +41,7 @@ public void visit(DslArticle.Tag tag) {
      * @param t Text object to visit.
      */
     @Override
-    public void visit(DslArticle.Text t) {
+    public void visit(final DslArticle.Text t) {
         out.print(t.getText());
     }
 
@@ -51,7 +51,7 @@ public void visit(DslArticle.Text t) {
      * @param a Attribute object to visit.
      */
     @Override
-    public void visit(DslArticle.Attribute a) {
+    public void visit(final DslArticle.Attribute a) {
     }
 
     /**
@@ -60,7 +60,7 @@ public void visit(DslArticle.Attribute a) {
      * @param n newline object to visit.
      */
     @Override
-    public void visit(DslArticle.Newline n) {
+    public void visit(final DslArticle.Newline n) {
         out.println();
     }
 
@@ -70,7 +70,7 @@ public void visit(DslArticle.Newline n) {
      * @param endTag to visit.
      */
     @Override
-    public void visit(DslArticle.EndTag endTag) {
+    public void visit(final DslArticle.EndTag endTag) {
     }
 
     @Override