Fix modernizer (#9824)

Co-authored-by: Siedlerchr <[email protected]>

build.gradle

@@ -498,6 +498,14 @@ checkstyle {
     sourceSets = []
 }
 
+modernizer {
+    failOnViolations = false
+    includeTestClasses = true
+    exclusions = [
+        'java/util/Optional.get:()Ljava/lang/Object;'
+    ]
+}
+
 // Release tasks
 task deleteInstallerTemp(type: Delete) {
     delete "$buildDir/installer"

src/main/java/org/jabref/gui/push/PushToLyx.java

@@ -4,6 +4,7 @@
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 
 import org.jabref.gui.DialogService;
@@ -86,7 +87,7 @@ public void pushEntries(BibDatabaseContext database, final List<BibEntry> entrie
         final File lyxpipe = lp;
 
         JabRefExecutorService.INSTANCE.executeAndWait(() -> {
-            try (FileWriter fw = new FileWriter(lyxpipe); BufferedWriter lyxOut = new BufferedWriter(fw)) {
+            try (FileWriter fw = new FileWriter(lyxpipe, StandardCharsets.UTF_8); BufferedWriter lyxOut = new BufferedWriter(fw)) {
                 String citeStr = "LYXCMD:sampleclient:citation-insert:" + keyString;
                 lyxOut.write(citeStr + "\n");
             } catch (IOException excep) {

src/main/java/org/jabref/logic/importer/fetcher/DoiFetcher.java

@@ -92,7 +92,7 @@ private void doAPILimiting(String identifier) {
                 } // mEDRA does not explicit an API rating
 
                 LOGGER.trace(String.format("Thread %s, searching for DOI '%s', waited %.2fs because of API rate limiter",
-                        Thread.currentThread().getId(), identifier, waitingTime));
+                        Thread.currentThread().threadId(), identifier, waitingTime));
             }
         } catch (IOException e) {
             LOGGER.warn("Could not limit DOI API access rate", e);

src/main/java/org/jabref/logic/l10n/Language.java

@@ -52,9 +52,9 @@ public static Optional<Locale> convertToSupportedLocale(Language language) {
         String[] languageParts = language.getId().split("_");
         Locale locale;
         if (languageParts.length == 1) {
-            locale = new Locale(languageParts[0]);
+            locale = Locale.of(languageParts[0]);
         } else if (languageParts.length == 2) {
-            locale = new Locale(languageParts[0], languageParts[1]);
+            locale = Locale.of(languageParts[0], languageParts[1]);
         } else {
             locale = Locale.ENGLISH;
         }

src/test/java/org/jabref/logic/importer/fetcher/CompositeSearchBasedFetcherTest.java

@@ -50,7 +50,7 @@ public void performSearchWithoutFetchers() throws Exception {
 
         List<BibEntry> result = fetcher.performSearch("quantum");
 
-        Assertions.assertEquals(result, Collections.EMPTY_LIST);
+        Assertions.assertEquals(result, Collections.emptyList());
     }
 
     @ParameterizedTest(name = "Perform Search on empty query.")
@@ -60,7 +60,7 @@ public void performSearchOnEmptyQuery(Set<SearchBasedFetcher> fetchers) throws E
 
         List<BibEntry> queryResult = compositeFetcher.performSearch("");
 
-        Assertions.assertEquals(queryResult, Collections.EMPTY_LIST);
+        Assertions.assertEquals(queryResult, Collections.emptyList());
     }
 
     @ParameterizedTest(name = "Perform search on query \"quantum\". Using the CompositeFetcher of the following " +

src/test/java/org/jabref/logic/integrity/UTF8CheckerTest.java

@@ -17,6 +17,7 @@
 
 public class UTF8CheckerTest {
 
+    private static final Charset GBK = Charset.forName("GBK");
     private final BibEntry entry = new BibEntry();
 
     /**
@@ -42,7 +43,7 @@ void fieldAcceptsUTF8() {
     @Test
     void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
         UTF8Checker checker = new UTF8Checker(Charset.forName("GBK"));
-        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(), "GBK");
+        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), GBK);
         entry.setField(StandardField.MONTH, NonUTF8);
         assertEquals(List.of(new IntegrityMessage("Non-UTF-8 encoded field found", entry, StandardField.MONTH)), checker.check(entry));
     }
@@ -56,8 +57,8 @@ void fieldDoesNotAcceptUmlauts() throws UnsupportedEncodingException {
      */
     @Test
     void NonUTF8EncodingCheckerTest() throws UnsupportedEncodingException {
-        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(), "GBK");
-            assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes("GBK")));
+        String NonUTF8 = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), GBK);
+            assertFalse(UTF8Checker.UTF8EncodingChecker(NonUTF8.getBytes(GBK)));
     }
 
     /**
@@ -66,7 +67,7 @@ void NonUTF8EncodingCheckerTest() throws UnsupportedEncodingException {
      */
     @Test
     void UTF8EncodingCheckerTest() {
-        String UTF8Demo = new String("你好，这条语句使用GBK字符集".getBytes(), StandardCharsets.UTF_8);
+        String UTF8Demo = new String("你好，这条语句使用GBK字符集".getBytes(StandardCharsets.UTF_8), StandardCharsets.UTF_8);
             assertTrue(UTF8Checker.UTF8EncodingChecker(UTF8Demo.getBytes(StandardCharsets.UTF_8)));
     }
 }

src/test/java/org/jabref/logic/l10n/LanguageTest.java

@@ -12,13 +12,13 @@ class LanguageTest {
 
     @Test
     void convertKnownLanguageOnly() {
-        assertEquals(Optional.of(new Locale("en")), Language.convertToSupportedLocale(Language.ENGLISH));
+        assertEquals(Optional.of(Locale.of("en")), Language.convertToSupportedLocale(Language.ENGLISH));
     }
 
     @Test
     void convertKnownLanguageAndCountryCorrect() {
         // Language and country code have to be separated see: https://stackoverflow.com/a/3318598
-        assertEquals(Optional.of(new Locale("pt", "BR")), Language.convertToSupportedLocale(Language.BRAZILIAN_PORTUGUESE));
+        assertEquals(Optional.of(Locale.of("pt", "BR")), Language.convertToSupportedLocale(Language.BRAZILIAN_PORTUGUESE));
     }
 
     @Test