#164 - Introduce checkstyle

- Fix remaining checkstyle issues - Use try-with-resources in some places - Add re-generate hashcode/equals where only equals was implemented without hashcode
dkpro · Oct 31, 2023 · d047e17 · d047e17
1 parent 1b9a679
commit d047e17
Show file tree

Hide file tree

Showing 18 changed files with 228 additions and 220 deletions.
diff --git a/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterator.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterator.java
@@ -271,4 +271,4 @@ private boolean fillBuffer()
         } // fillBuffer
 
     }
-}
+}
diff --git a/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Wikipedia.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Wikipedia.java
@@ -918,15 +918,15 @@ public String getWikipediaId()
         return sb.toString();
     }
 
-}
-
-class ValueComparator
-    implements Comparator<Entry<Integer, Double>>
-{
-
-    @Override
-    public int compare(Entry<Integer, Double> e1, Entry<Integer, Double> e2)
+    private static class ValueComparator
+        implements Comparator<Entry<Integer, Double>>
     {
-        return Double.compare(e2.getValue(), e1.getValue());
+
+        @Override
+        public int compare(Entry<Integer, Double> e1, Entry<Integer, Double> e2)
+        {
+            return Double.compare(e2.getValue(), e1.getValue());
+        }
     }
+
 }
diff --git a/...ne/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKGeneric.java b/...ne/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKGeneric.java
@@ -228,15 +228,15 @@ public void processTextRow(TextParser textParser) throws IOException
 
             int page_id = textIdPageIdMap.get(text_id);
             String page_idValueP = pPageIdNameMap.get(page_id);
-            if (page_idValueP != null) {// pages
+            if (page_idValueP != null) { // pages
                 page.addRow(page_id, page_id, page_idValueP, textParser.getOldText(),
                         formatBoolean(disambiguations.contains(page_id)));
                 pageMapLine.addRow(page_id, page_idValueP, page_id, SQL_NULL, SQL_NULL);
 
             }
             else {
                 String page_idValueR = rPageIdNameMap.get(page_id);
-                if (page_idValueR != null) {// Redirects
+                if (page_idValueR != null) { // Redirects
                     String destination = Redirects.getRedirectDestination(textParser.getOldText());
                     if (destination != null) {
                         KeyType destinationHash = (KeyType) hashAlgorithm.hashCode(destination);
@@ -252,20 +252,18 @@ public void processTextRow(TextParser textParser) throws IOException
                 }
             }
         }
-
     }
 
     @Override
     public void writeMetaData() throws IOException
     {
-        TxtFileWriter outputFile = new TxtFileWriter(versionFiles.getOutputMetadata());
-        // ID,LANGUAGE,DISAMBIGUATION_CATEGORY,MAIN_CATEGORY,nrOfPages,nrOfRedirects,nrOfDisambiguationPages,nrOfCategories
-        outputFile.addRow(metaData.getId(), metaData.getLanguage(),
-                metaData.getDisambiguationCategory(), metaData.getMainCategory(),
-                metaData.getNrOfPages(), metaData.getNrOfRedirects(),
-                metaData.getNrOfDisambiguations(), metaData.getNrOfCategories());
-        outputFile.flush();
-        outputFile.close();
+        try (var outputFile = new TxtFileWriter(versionFiles.getOutputMetadata())) {
+            // ID, LANGUAGE, DISAMBIGUATION_CATEGORY, MAIN_CATEGORY, nrOfPages, nrOfRedirects,
+            // nrOfDisambiguationPages, nrOfCategories
+            outputFile.addRow(metaData.getId(), metaData.getLanguage(),
+                    metaData.getDisambiguationCategory(), metaData.getMainCategory(),
+                    metaData.getNrOfPages(), metaData.getNrOfRedirects(),
+                    metaData.getNrOfDisambiguations(), metaData.getNrOfCategories());
+        }
     }
-
 }
diff --git a/...hine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionOriginal.java b/...hine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionOriginal.java
@@ -305,9 +305,10 @@ public void processPageRow(PageParser pageParser) throws IOException
         // handle categories
         if (page_namespace == 14) {
             if (skipCategory) {
-                if (pageParser.getPageIsRedirect())
+                if (pageParser.getPageIsRedirect()) {
                     // skip categories that are redirects
                     return;
+                }
             }
             // retrieve page id and page title
             page_id = pageParser.getPageId();
@@ -358,25 +359,26 @@ public void processTextRow(TextParser textParser) throws IOException
         int page_id;
 
         text_id = textParser.getOldId();
-        if (!textIdPageIdMap.containsKey(text_id))
+        if (!textIdPageIdMap.containsKey(text_id)) {
             return;
+        }
         page_id = textIdPageIdMap.get(text_id);
-        if (pPageIdNameMap.containsKey(page_id)) {// pages
+        if (pPageIdNameMap.containsKey(page_id)) { // pages
             page.addRow(page_id, page_id, pPageIdNameMap.get(page_id), textParser.getOldText(),
                     formatBoolean(disambiguations.contains(page_id)));
             pageMapLine.addRow(page_id, pPageIdNameMap.get(page_id), page_id, "NULL", "NULL");
             return;
         }
-        if (rPageIdNameMap.containsKey(page_id)) {// Redirects
+        if (rPageIdNameMap.containsKey(page_id)) { // Redirects
             destination = Redirects.getRedirectDestination(textParser.getOldText());
-            if (!pNamePageIdMap.containsKey(destination))
+            if (!pNamePageIdMap.containsKey(destination)) {
                 return;
+            }
             pageRedirects.addRow(pNamePageIdMap.get(destination), rPageIdNameMap.get(page_id));
             pageMapLine.addRow(page_id, rPageIdNameMap.get(page_id),
                     pNamePageIdMap.get(destination), "NULL", "NULL");
             nrOfRedirects++;
         }
-
     }
 
     @Override
@@ -406,7 +408,8 @@ public void writeMetaData() throws IOException
     {
         try (TxtFileWriter metaData = new TxtFileWriter(
                 outputDir + File.separator + "MetaData.txt")) {
-            // ID,LANGUAGE,DISAMBIGUATION_CATEGORY,MAIN_CATEGORY,nrOfPages,nrOfRedirects,nrOfDisambiguationPages,nrOfCategories
+            // ID, LANGUAGE, DISAMBIGUATION_CATEGORY, MAIN_CATEGORY, nrOfPages, nrOfRedirects,
+            // nrOfDisambiguationPages, nrOfCategories
             metaData.addRow("null", language, disambiguationsCategory, mainCategory, nrOfPages,
                     nrOfRedirects, nrOfDisambiguations, nrOfCategories);
             metaData.export();

diff --git a/...jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/file/DeleteFilesAtShutdown.java b/...jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/file/DeleteFilesAtShutdown.java
@@ -77,4 +77,4 @@ public static synchronized void register(Path filePath)
         }
         paths.add(filePath);
     }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -271,4 +271,4 @@ private boolean fillBuffer() @@
             } // fillBuffer
         }
-    }
+    }